fixing is delivered notification wa

.env.example

@@ -45,4 +45,18 @@ IMAGEKIT_PRIVATE_KEY=private_vhO/jXHnEoaVYptOHIuZDPMbxIA=
 # CLIENT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxx
 # REFRESH_TOKEN=1//XXXXXXXX
 
+ENDPOINT_WHATSAPP=https://117.102.231.130:9531/send
+# ENDPOINT_WHATSAPP=http://localhost:9529/send
+
+# ENDPOINT_FE=http://localhost:8592
+# ENDPOINT_FE=http://203.153.114.226:8466
+ENDPOINT_FE=https://117.102.231.130:9529
+
+
+# MQTT Connection
+MQTT_HOST=ws://117.102.231.130:7001
+MQTT_USERNAME=morekmorekmorek
+MQTT_PASSWORD=morek888
+TOPIC_COD=PIU_COD/ERROR_CODE
+
 VITE_KEY_SESSION=PetekRombonganPetekMorekMorakMarek

config/index.js

@@ -292,12 +292,12 @@ const mqttOptions = {
   clientId: 'express_mqtt_client_' + Math.random().toString(16).substr(2, 8),
   clean: true,
   connectTimeout: 4000,
-  username: '', // jika ada
+  username: process.env.MQTT_USERNAME ?? 'morekmorekmorek', // jika ada
-  password: '', // jika ada
+  password: process.env.MQTT_PASSWORD ?? 'morek888', // jika ada
 };
 
-const mqttUrl = 'ws://localhost:1884'; // Ganti dengan broker kamu
+const mqttUrl = process.env.MQTT_HOST; // Ganti dengan broker kamu
-const topic = 'morek';
+const topic = process.env.TOPIC_COD ?? 'morek';
 
 const mqttClient = mqtt.connect(mqttUrl, mqttOptions);
 

controllers/auth.controller.js

@@ -104,6 +104,8 @@ class AuthController {
     const bytes = CryptoJS.AES.decrypt(tokenRedirect, process.env.VITE_KEY_SESSION);
     const decrypted = JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
 
+    console.log("decrypted: ", decrypted);
+
     const userPhone = decrypted?.user_phone
     const userName = decrypted?.user_name
     const idData = decrypted?.id

controllers/notification_error.controller.js

@@ -75,22 +75,13 @@ class NotificationErrorController {
   }
 
   static async resend(req, res) {
-    try {
+    const { id } = req.params;
-      const { id } = req.params;
+    const results = await NotificationErrorService.resendNotification(id);
-
+    const response = await setResponse(
-      const results = await NotificationErrorService.resendNotification(id);
+      results,
-
+      "Notification Error resend successfully"
-      const response = await setResponse(results, results.message);
+    );
-
+    res.status(response.statusCode).json(response);
-      res.status(response.statusCode).json(response);
-    } catch (error) {
-      const response = setResponse(
-        null,
-        error.message,
-        error.statusCode || 500
-      );
-      res.status(response.statusCode).json(response);
-    }
   }
 }
 

controllers/notification_error_user.controller.js

@@ -1,14 +1,28 @@
-const NotificationErrorUserService = require('../services/notification_error_user.service');
+const NotificationErrorUserService = require("../services/notification_error_user.service");
-const { setResponse, setResponsePaging, checkValidate } = require('../helpers/utils');
+const {
-const { insertNotificationErrorUserSchema, updateNotificationErrorUserSchema } = require('../validate/notification_error_user.schema');
+  setResponse,
+  setResponsePaging,
+  checkValidate,
+} = require("../helpers/utils");
+const {
+  insertNotificationErrorUserSchema,
+  updateNotificationErrorUserSchema,
+} = require("../validate/notification_error_user.schema");
 
 class NotificationErrorUserController {
   // Get all NotificationErrorUser
   static async getAll(req, res) {
     const queryParams = req.query;
 
-    const results = await NotificationErrorUserService.getAllNotificationErrorUser(queryParams);
+    const results =
-    const response = await setResponsePaging(queryParams, results, 'Notification Error User found')
+      await NotificationErrorUserService.getAllNotificationErrorUser(
+        queryParams
+      );
+    const response = await setResponsePaging(
+      queryParams,
+      results,
+      "Notification Error User found"
+    );
 
     res.status(response.statusCode).json(response);
   }
@@ -17,24 +31,35 @@ class NotificationErrorUserController {
   static async getById(req, res) {
     const { id } = req.params;
 
-    const results = await NotificationErrorUserService.getNotificationErrorUserById(id);
+    const results =
-    const response = await setResponse(results, 'Notification Error User found')
+      await NotificationErrorUserService.getNotificationErrorUserById(id);
+    const response = await setResponse(
+      results,
+      "Notification Error User found"
+    );
 
     res.status(response.statusCode).json(response);
   }
 
   // Create NotificationErrorUser
   static async create(req, res) {
-    const { error, value } = await checkValidate(insertNotificationErrorUserSchema, req)
+    const { error, value } = await checkValidate(
+      insertNotificationErrorUserSchema,
+      req
+    );
 
     if (error) {
-      return res.status(400).json(setResponse(error, 'Validation failed', 400));
+      return res.status(400).json(setResponse(error, "Validation failed", 400));
     }
 
-    value.userId = req.user.user_id
+    value.userId = req.user.user_id;
 
-    const results = await NotificationErrorUserService.createNotificationErrorUser(value);
+    const results =
-    const response = await setResponse(results, 'Notification Error User created successfully')
+      await NotificationErrorUserService.createNotificationErrorUser(value);
+    const response = await setResponse(
+      results,
+      "Notification Error User created successfully"
+    );
 
     return res.status(response.statusCode).json(response);
   }
@@ -43,16 +68,23 @@ class NotificationErrorUserController {
   static async update(req, res) {
     const { id } = req.params;
 
-    const { error, value } = checkValidate(updateNotificationErrorUserSchema, req)
+    const { error, value } = checkValidate(
+      updateNotificationErrorUserSchema,
+      req
+    );
 
     if (error) {
-      return res.status(400).json(setResponse(error, 'Validation failed', 400));
+      return res.status(400).json(setResponse(error, "Validation failed", 400));
     }
 
-    value.userId = req.user.user_id
+    value.userId = req.user.user_id;
 
-    const results = await NotificationErrorUserService.updateNotificationErrorUser(id, value);
+    const results =
-    const response = await setResponse(results, 'Notification Error User updated successfully')
+      await NotificationErrorUserService.updateNotificationErrorUser(id, value);
+    const response = await setResponse(
+      results,
+      "Notification Error User updated successfully"
+    );
 
     res.status(response.statusCode).json(response);
   }
@@ -61,28 +93,30 @@ class NotificationErrorUserController {
   static async delete(req, res) {
     const { id } = req.params;
 
-    const results = await NotificationErrorUserService.deleteNotificationErrorUser(id, req.user.user_id);
+    const results =
-    const response = await setResponse(results, 'Notification Error User deleted successfully')
+      await NotificationErrorUserService.deleteNotificationErrorUser(
+        id,
+        req.user.user_id
+      );
+    const response = await setResponse(
+      results,
+      "Notification Error User deleted successfully"
+    );
 
     res.status(response.statusCode).json(response);
   }
-  
+
   static async resendByUser(req, res) {
-    try {
+    const { id, contact_phone } = req.params;
-      const { id, contact_phone } = req.params;
+    const results = await NotificationErrorUserService.resendNotificationByUser(
-
+      id,
-      const results = await NotificationErrorUserService.resendNotificationByUser(id, contact_phone)
+      contact_phone
-      
+    );
-      const response = await setResponse(
+    const response = await setResponse(
-        results, 
+      results,
-        results.message,
+      "Notification Error By User resend successfully"
-      );
+    );
-
+    res.status(response.statusCode).json(response);
-      res.status(response.statusCode).json(response);
-    } catch (error) {
-      const response = setResponse(null, error.message, error.statusCode || 500);
-      res.status(response.statusCode).json(response);
-    }
   }
 }
 

db/notification_error.db.js

@@ -43,6 +43,23 @@ const getNotificationByIdDb = async (id) => {
   return result.recordset[0];
 };
 
+const getDeviceNotificationByIdDb = async (chanel_id) => {
+  const queryText = `
+    SELECT 
+      brand_id,
+      device_code, 
+      device_name, 
+      device_location, 
+      listen_channel 
+
+    FROM m_device 
+    WHERE listen_channel = $1 
+    AND deleted_at IS NULL 
+  `;
+  const result = await pool.query(queryText, [chanel_id]);
+  return result.recordset[0];
+};
+
 
 const getAllNotificationDb = async (searchParams = {}) => {
   let queryParams = [];
@@ -79,7 +96,8 @@ const getAllNotificationDb = async (searchParams = {}) => {
     ],
     queryParams
   );
-  if (whereParamAnd) queryParams = whereParamAnd;
+
+  queryParams = whereParamAnd ? whereParamAnd : queryParams;
 
   const queryText = `
     SELECT
@@ -92,12 +110,12 @@ const getAllNotificationDb = async (searchParams = {}) => {
       a.is_delivered,
       a.is_read,
       a.is_active,
+      a.created_at,
 
       b.error_code,
       b.error_code_name,
       b.error_code_color,
       b.path_icon,
-      b.created_at,
 
       c.solution_name,
       c.type_solution,
@@ -113,17 +131,17 @@ const getAllNotificationDb = async (searchParams = {}) => {
 
       FROM notification_error a
 
-      LEFT JOIN brand_code b
-        ON a.error_code_id = b.error_code_id AND b.deleted_at IS NULL
-
-      LEFT JOIN brand_code_solution c
-        ON b.error_code_id = c.error_code_id AND c.deleted_at IS NULL
-        
       LEFT JOIN m_device d
         ON a.error_chanel = d.listen_channel AND d.deleted_at IS NULL
 
+      LEFT JOIN brand_code b
+        ON a.error_code_id = b.error_code AND b.deleted_at IS NULL AND d.brand_id = b.brand_id
+
+      LEFT JOIN brand_code_solution c
+        ON b.error_code_id = c.error_code_id AND c.deleted_at IS NULL
+
       LEFT JOIN m_brands e
-        ON d.brand_id = e.brand_id AND d.deleted_at IS NULL
+        ON d.brand_id = e.brand_id AND e.deleted_at IS NULL
 
     WHERE a.deleted_at IS NULL
       ${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}
@@ -155,7 +173,7 @@ const updateNotificationErrorDb = async (id, data) => {
   );
 
   await pool.query(`${queryText} AND deleted_at IS NULL`, values);
-  return getNotificationByIdDb(id); 
+  return getNotificationByIdDb(id);
 };
 
 const getUsersNotificationErrorDb = async (id) => {
@@ -178,16 +196,17 @@ const getUsersNotificationErrorDb = async (id) => {
     WHERE a.notification_error_id = $1 
       AND a.deleted_at IS NULL
   `;
-  
+
   const result = await pool.query(queryText, [id]);
   return result.recordset;
 };
 
 module.exports = {
   getNotificationByIdDb,
+  getDeviceNotificationByIdDb,
   getAllNotificationDb,
   InsertNotificationErrorDb,
   updateNotificationErrorDb,
   getUsersNotificationErrorDb
-  
+
 };

db/notification_error_log.db.js

@@ -32,11 +32,15 @@ const getNotificationErrorLogByIdDb = async (id) => {
 const getNotificationErrorLogByNotificationErrorIdDb = async (notificationErrorId) => {
   const queryText = `
     SELECT
-      a.*,
+      a.notification_error_log_description,
-      b.contact_name,
+      a.created_at,
-      b.contact_type
+      b.contact_type,
+      c.user_fullname as created_by_name,
+      case when a.created_by is not null then c.user_fullname else b.contact_name end as contact_name,
+      case when a.created_by is not null then c.user_phone else a.contact_phone end as contact_phone
     FROM notification_error_log a
     LEFT JOIN contact b ON a.contact_phone = b.contact_phone
+    LEFT JOIN m_users c ON a.created_by = c.user_id
     WHERE a.notification_error_id = $1 AND a.deleted_at IS NULL
     ORDER BY a.created_at DESC
   `;

db/notification_error_user.db.js

@@ -61,10 +61,24 @@ const getNotificationErrorUserByIdDb = async (id) => {
   const queryText = `
     SELECT 
       a.*,
-      b. is_active as contact_is_active
+
+      b. is_active as contact_is_active,
+
+      d.error_code,
+      d.error_code_name,
+
+      e.device_name
       
     FROM notification_error_user a
+    
     LEFT JOIN contact b ON a.contact_phone = b.contact_phone
+
+    LEFT JOIN notification_error c ON a.notification_error_id = c.notification_error_id
+
+    LEFT JOIN brand_code d ON d.error_code_id = c.error_code_id
+
+    LEFT JOIN m_device e ON c.error_chanel = e.listen_channel
+
     WHERE a.notification_error_user_id = $1 AND a.deleted_at IS NULL
   `;
   const result = await pool.query(queryText, [id]);

db/notification_wa.db.js

@@ -1,5 +1,11 @@
+// db/notification_wa.db.js
 const { default: axios } = require('axios');
 const CryptoJS = require('crypto-js');
+const https = require('https');
+
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+});
 
 const generateTokenRedirect = async (userPhone, userName, id) => {
 
@@ -18,7 +24,7 @@ const shortUrltiny = async (encodedToken) => {
 
   const encodedUrl = encodeURIComponent(url); // ⬅️ Encode dulu!
 
-  const response = await axios.get(`https://tinyurl.com/api-create.php?url=${encodedUrl}`);
+  const response = await axios.get(`https://tinyurl.com/api-create.php?url=${encodedUrl}`, { httpsAgent });
 
   let shortUrl = response.data;
   if (!shortUrl.startsWith('http')) {
@@ -38,18 +44,24 @@ const sendNotifikasi = async (phone, message) => {
 
   const endPointWhatsapp = process.env.ENDPOINT_WHATSAPP;
 
-  const response = await axios.post(endPointWhatsapp, payload);
-  // console.log('response', response);
-
   try {
-    const response = await axios.post(endPointWhatsapp, payload);
+    const response = await axios.post(endPointWhatsapp, payload, { httpsAgent });
-    // console.log(response.data);
+
-    return response?.data
+    return {
+      success: true,
+      statusCode: response.status,   // 200, 201, dll
+      data: response.data
+    };
   } catch (error) {
-    // console.error(error.response?.data || error.message);
+    return {
-    return error.response?.data || error.message
+      success: false,
+      statusCode: error.response?.status || null,
+      errorCode: error.code || null,  // ECONNABORTED, dll
+      message: error.response?.data || error.message
+    };
   }
 
+
 };
 
 module.exports = {

middleware/verifyAccess.js

@@ -1,6 +1,10 @@
 const { ErrorHandler } = require("../helpers/error");
 const { getUserByIdDb } = require("../db/user.db");
 
+function isPhoneNumberID(phone) {
+  return /^(?:\+62|62|0)8[1-9][0-9]{6,10}$/.test(phone);
+}
+
 const verifyAccess = (minLevel = 1, allowUnapprovedReadOnly = false) => {
   return async (req, res, next) => {
     try {
@@ -11,21 +15,31 @@ const verifyAccess = (minLevel = 1, allowUnapprovedReadOnly = false) => {
       // Super Admin bypass semua
       if (user.is_sa) return next();
 
-      const fullUser = await getUserByIdDb(user.user_id);
-      if (!fullUser) throw new ErrorHandler(403, "Forbidden: User not found");
 
-      if (!fullUser.is_approve) {
+      if (!isPhoneNumberID(user.user_id) && user.user_id) {
-        if (req.method !== "GET") {
+        const fullUser = await getUserByIdDb(user.user_id);
-          throw new ErrorHandler(403, "Account not approved — read-only access");
+        if (!fullUser) throw new ErrorHandler(403, "Forbidden: User not found");
+
+        if (!fullUser.is_approve) {
+          if (req.method !== "GET") {
+            throw new ErrorHandler(403, "Account not approved — read-only access");
+          }
+
+          if (allowUnapprovedReadOnly) return next();
+
+          throw new ErrorHandler(403, "Account not approved");
         }
 
-        if (allowUnapprovedReadOnly) return next();
+        if (!fullUser.role_level || fullUser.role_level < minLevel) {
+          throw new ErrorHandler(403, "Forbidden: Insufficient role level");
+        }
+      } else {
+        if (req.method !== 'GET' && req.baseUrl !== '/api/notification-log') {
+          if (req.baseUrl !== '/api/notification') {
+            throw new ErrorHandler(403, "Forbidden: Insufficient Access");
+          }
+        }
 
-        throw new ErrorHandler(403, "Account not approved");
-      }
-
-      if (!fullUser.role_level || fullUser.role_level < minLevel) {
-        throw new ErrorHandler(403, "Forbidden: Insufficient role level");
       }
 
       next();

routes/notification_error_log.route.js

@@ -7,7 +7,10 @@ const router = express.Router();
 
 router.route("/")
     .get(verifyToken.verifyAccessToken, NotificationErrorLogController.getAll)
-    .post(verifyToken.verifyAccessToken, verifyAccess(), NotificationErrorLogController.create);
+    .post(
+        verifyToken.verifyAccessToken,
+        verifyAccess(),
+        NotificationErrorLogController.create);
 
 router.route("/:id")
     .get(verifyToken.verifyAccessToken, NotificationErrorLogController.getById);

services/error_code.service.js

@@ -119,17 +119,6 @@ class ErrorCodeService {
     try {
       if (!data || typeof data !== "object") data = {};
 
-      if (
-        !data.solution ||
-        !Array.isArray(data.solution) ||
-        data.solution.length === 0
-      ) {
-        throw new ErrorHandler(
-          400,
-          "Error code must have at least 1 solution"
-        );
-      }
-
       const errorId = await createErrorCodeDb(brandId, {
         error_code: data.error_code,
         error_code_name: data.error_code_name,

services/notification_error.service.js

@@ -1,3 +1,4 @@
+// services/notification_error.service.js
 const {
   getAllNotificationDb,
   getNotificationByIdDb,
@@ -64,7 +65,7 @@ class NotificationService {
 
       return result;
     } catch (error) {
-      throw new ErrorHandler(error.statusCode, error.message);
+      return error;
     }
   }
 
@@ -150,7 +151,7 @@ class NotificationService {
       const notification = Array.isArray(dataExist) ? dataExist[0] : dataExist;
 
       if (notification.is_read === true) {
-        throw new ErrorHandler(400, "Notification has already been read");
+        return { success: true, message: "Notification has already been read" };
       }
 
       if (!notification.is_read) {
@@ -171,68 +172,94 @@ class NotificationService {
   }
 
   static async resendNotification(id) {
-    try {
+    const deviceNotification = await getNotificationByIdDb(id);
-      const dataExist = await getUsersNotificationErrorDb(id);
+    if (!deviceNotification) throw new ErrorHandler(404, "Data not found");
 
-      const activeUsers =
+    const errorCode = await getErrorCodeByIdDb(
-        dataExist?.filter((user) => user.is_active === true) || [];
+      deviceNotification.error_code_id
+    );
+    const dataExist = await getUsersNotificationErrorDb(id);
 
-      if (activeUsers.length < 1) {
+    const activeUsers =
-        throw new ErrorHandler(
+      dataExist?.filter((user) => user.is_active === true) || [];
-          404,
+
-          "No active contacts found for this notification"
+    if (activeUsers.length < 1)
+      throw new ErrorHandler(404, "No active contacts");
+
+    this._executeResendWa(
+      id,
+      activeUsers,
+      deviceNotification,
+      errorCode
+    ).catch((err) => console.error("Background Process Error:", err));
+
+    return {
+      count: activeUsers.length,
+    };
+  }
+
+  static async _executeResendWa(
+    id,
+    activeUsers,
+    deviceNotification,
+    errorCode
+  ) {
+    console.log(`user active: `, id, activeUsers);
+
+    const sendPromises = activeUsers.map(async (user) => {
+      try {
+       console.log(`user: ${user.contact_name} (${user.contact_phone})`);
+        const tokenRedirect = await generateTokenRedirect(
+          user.contact_phone,
+          user.contact_name,
+          id
         );
+
+        const encodedToken = encodeURIComponent(tokenRedirect);
+        console.log("token: ", tokenRedirect);
+        const shortUrl = await shortUrltiny(encodedToken);
+        console.log("URL:", shortUrl);
+
+        const bodyWithUrl =
+          `Hai ${user.contact_name || "-"}\n` +
+          `Terjadi peringatan dengan kode ${errorCode?.error_code || "-"} - ${
+            errorCode?.error_code_name
+          } pada device ${deviceNotification.device_name || "-"}.\n` +
+          `Silahkan cek detail pada link berikut:\n ${shortUrl}`;
+
+        const resultSend = await sendNotifikasi(
+          user.contact_phone,
+          bodyWithUrl
+        );
+        
+        console.log("notifikasi wa:", resultSend)
+
+        const isSuccess = resultSend.success;
+
+        await updateNotificationErrorDb(user.notification_error_id, {
+          is_send: isSuccess,
+          is_delivered: isSuccess,
+        });
+
+        return { phone: user.contact_phone, status: "success" };
+      } catch (err) {
+        console.error(`Gagal mengirim ke ${user.contact_phone}:`, err.message);
+        return {
+          phone: user.contact_phone,
+          status: "failed",
+          error: err.message,
+        };
       }
+    });
 
-      if (!dataExist || dataExist.length < 1) {
+    const results = await Promise.all(sendPromises);
-        throw new ErrorHandler(404, "Data Notification Error not found");
+    console.log("result akhir: ", results)
-      }
 
-      const results = await Promise.all(
+    console.log(
-        dataExist &&
+      `Resend chat: ${
-          activeUsers.map(async (user) => {
+        results.filter((r) => r.status === "success").length
-            const tokenRedirect = await generateTokenRedirect(
+      }, Gagal: ${results.filter((r) => r.status === "failed").length}`
-              user.contact_phone,
+    );
-              user.contact_name,
-              user.notification_error_id
-            );
-
-            const encodedToken = encodeURIComponent(tokenRedirect);
-            const shortUrl = await shortUrltiny(encodedToken);
-
-            const bodyBase =
-              `Hai Operator\n` +
-              `Terjadi peringatan pada device, silahkan cek detail pada link berikut :\n`;
-            const bodyWithUrl = `${bodyBase}\n🔗 ${shortUrl}`;
-
-            const resultSend = await sendNotifikasi(
-              user.contact_phone,
-              bodyWithUrl
-            );
-            const isSuccess = resultSend?.error ? false : true;
-
-            await updateNotificationErrorDb(user.notification_error_id, {
-              is_send: isSuccess,
-              is_delivered: isSuccess,
-            });
-
-            return {
-              contact_name: user.contact_name,
-              contact_phone: user.contact_phone,
-              is_send: isSuccess,
-              is_delivered: isSuccess,
-            };
-          })
-      );
-
-      return {
-        notification_error_id: id,
-        user: results,
-        message: "Berhasil mengirim ulang notifikasi",
-      };
-    } catch (error) {
-      throw new ErrorHandler(error.statusCode || 500, error.message);
-    }
   }
 }
 

services/notification_error_user.service.js

@@ -92,76 +92,103 @@ class NotificationErrorUserService {
   }
 
   static async resendNotificationByUser(id, contact_phone) {
+    const results = [];
 
-    try {
+    const idUser = Array.isArray(id) ? id : [id];
-      const dataExist = await getNotificationErrorUserByIdDb(id);
+
-      if (!dataExist || dataExist.length < 1) {
+    for (const id of idUser) {
-        throw new ErrorHandler(
+      try {
-          404,
+        const dataExist = await getNotificationErrorUserByIdDb(id);
-          "Data Notification Error User not found"
+
+        if (!dataExist || dataExist.length < 1) {
+          results.push({
+            id,
+            status: "failed",
+            message: "Data Notification Error User not found",
+          });
+          continue;
+        }
+
+        const data = dataExist[0];
+
+        if (data.contact_phone !== contact_phone) {
+          results.push({
+            id,
+            status: "failed",
+            message: `Phone ${contact_phone} not found.`,
+          });
+          continue;
+        }
+
+        if (data.contact_is_active === false) {
+          results.push({
+            id,
+            status: "failed",
+            message: `Contact ${data.contact_phone} not active.`,
+          });
+          continue;
+        }
+
+        const tokenRedirect = await generateTokenRedirect(
+          data.contact_phone,
+          data.contact_name,
+          data.notification_error_id
         );
-      }
 
-      const data = dataExist[0];
+        const encodedToken = encodeURIComponent(tokenRedirect);
+        const shortUrl = await shortUrltiny(encodedToken);
 
-      if (data.contact_phone !== contact_phone) {
+        const bodyWithUrl =
-        throw new ErrorHandler(
+          `Hai ${data.contact_name || "-"}\n` +
-          404,
+          `Terjadi peringatan dengan kode error ${data.error_code || "-"} - ${
-          `Contact Phone with this phone ${contact_phone} not found.`
+            data.error_code_name || "-"
+          } ` +
+          `pada device ${
+            data.device_name || "-"
+          }, silahkan cek detail pada link berikut:\n` +
+          `${shortUrl}`;
+
+        const resultSend = await sendNotifikasi(
+          data.contact_phone,
+          bodyWithUrl
         );
+        const isSuccess = resultSend.success;
+
+        const updateData = {
+          is_send: isSuccess,
+          message_error_issue: bodyWithUrl,
+        };
+
+        await updateNotificationErrorUserDb(id, updateData);
+
+        if (!isSuccess) {
+          results.push({
+            id,
+            status: "failed",
+            message: `WhatsApp API Gagal: ${
+              resultSend?.message || "Unknown Error"
+            }`,
+          });
+        } else {
+          results.push({
+            status: 200,
+            notification_error_user_id: id,
+            notification_error_id: data.notification_error_id,
+            device_name: data.device_name,
+            error_code: data?.error_code,
+            error_code_name: data?.error_code_name,
+            users: {
+              contact_name: data.contact_name,
+              contact_phone: data.contact_phone,
+              is_send: isSuccess,
+            },
+          });
+        }
+      } catch (err) {
+        results.push({ id, status: "error", message: err.message });
       }
-
-      if (data.contact_is_active === false) {
-        throw new ErrorHandler(
-          400,
-          `Contact Phone with this phone ${data.contact_phone} not active.`
-        );
-      }
-
-      const tokenRedirect = await generateTokenRedirect(
-        data.contact_phone,
-        data.contact_name,
-        data.notification_error_id
-      );
-
-      const encodedToken = encodeURIComponent(tokenRedirect);
-      const shortUrl = await shortUrltiny(encodedToken);
-
-      const bodyBase =
-        `Hai Operator\n` +
-        `Terjadi peringatan pada device, silahkan cek detail pada link berikut :\n`;
-
-      const bodyWithUrl = `${bodyBase}\n🔗 ${shortUrl}`;
-
-      const resultSend = await sendNotifikasi(data.contact_phone, bodyWithUrl);
-
-      const isSuccess = resultSend?.error ? false : true;
-
-      const updateData = {
-        is_send: isSuccess,
-        message_error_issue: bodyWithUrl,
-      };
-
-      await updateNotificationErrorUserDb(id, updateData);
-
-      if (!isSuccess) {
-        throw new ErrorHandler(
-          500,
-          `WhatsApp API Gagal mengirim pesan: ${
-            resultSend?.message || "Unknown Error"
-          }`
-        );
-      }
-
-      return {
-        notification_error_user_id: id,
-        is_send: isSuccess,
-        short_url: shortUrl,
-        message: "Berhasil mengirim ulang notifikasi",
-      };
-    } catch (error) {
-      throw new ErrorHandler(error.statusCode || 500, error.message);
     }
+    return results;
   }
 }
 

services/notifikasi-wa.service.js

@@ -1,19 +1,26 @@
-const { getAllContactDb } = require('../db/contact.db');
+const { getAllContactDb } = require("../db/contact.db");
-const { InsertNotificationErrorDb } = require('../db/notification_error.db');
+const { InsertNotificationErrorDb, updateNotificationErrorDb } = require("../db/notification_error.db");
-const { createNotificationErrorUserDb, updateNotificationErrorUserDb } = require('../db/notification_error_user.db');
+const {
-const { generateTokenRedirect, shortUrltiny, sendNotifikasi } = require('../db/notification_wa.db');
+  createNotificationErrorUserDb,
+  updateNotificationErrorUserDb,
+} = require("../db/notification_error_user.db");
+const {
+  generateTokenRedirect,
+  shortUrltiny,
+  sendNotifikasi,
+} = require("../db/notification_wa.db");
+const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
+const { getDeviceNotificationByIdDb } = require("../db/notification_error.db");
 
 class NotifikasiWaService {
-
   async onNotification(topic, message) {
-
     try {
       const paramDb = {
         limit: 100,
         page: 1,
-        criteria: '',
+        criteria: "",
-        active: 1
+        active: 1,
-      }
+      };
 
       // const chanel = {
       //   "time": "2025-12-11 11:10:58",
@@ -22,86 +29,113 @@ class NotifikasiWaService {
       //   "c_6501": 0
       // }
 
-      if (topic === 'morek') {
+      if (topic === process.env.TOPIC_COD ?? "morek") {
-
         const dataMqtt = JSON.parse(message);
 
         const resultChanel = [];
 
         Object.entries(dataMqtt).forEach(([key, value]) => {
-          if (key.startsWith('c_')) {
+          if (key.startsWith("c_")) {
             resultChanel.push({
               chanel_id: Number(key.slice(2)),
-              value
+              value,
             });
           }
         });
 
         const results = await getAllContactDb(paramDb);
 
-        const bodyMessage = `Hai Operator\n` +
-          `Terjadi peringatan pada device, silahkan cek detail pada link berikut :\n`;
-
         const dataUsers = results.data;
 
         for (const chanel of resultChanel) {
-          const data = {
+          const deviceNotification = await getDeviceNotificationByIdDb(
-            "error_code_id": chanel.value,
+            Number(chanel.chanel_id)
-            "error_chanel": chanel.chanel_id,
+          );
-            "message_error_issue": bodyMessage,
-            "is_send": false,
-            "is_delivered": false,
-            "is_read": false,
-            "is_active": true
-          }
 
-          const resultNotificationError = await InsertNotificationErrorDb(data)
+          const errorCode = await getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0, chanel.value);
+
+          const data = {
+            error_code_id: chanel.value,
+            error_chanel: chanel.chanel_id,
+            is_send: false,
+            is_delivered: false,
+            is_read: false,
+            is_active: true,
+          };
+
+          const resultNotificationError = await InsertNotificationErrorDb(data);
+
+          let isSendNotification = false
 
           for (const dataUser of dataUsers) {
             if (dataUser.is_active) {
+              const tokenRedirect = await generateTokenRedirect(
+                dataUser.contact_phone,
+                dataUser.contact_name,
+                resultNotificationError.notification_error_id
+              );
+
+              const encodedToken = encodeURIComponent(tokenRedirect);
+
+              const shortUrl = await shortUrltiny(encodedToken);
+
+              const bodyMessage =
+                `Hai ${dataUser.contact_name || "-"}\n` +
+                `Terjadi kode error ${chanel?.value ?? "-"} ${errorCode?.error_code_name ?? ""}Chanel ${chanel?.chanel_id ?? "-"} ` +
+                `pada device ${deviceNotification?.device_name ?? "berikut"
+                }, Silahkan cek detail pada link berikut:\n` +
+                `${shortUrl}`;
 
               const param = {
                 idData: resultNotificationError.notification_error_id,
                 userPhone: dataUser.contact_phone,
                 userName: dataUser.contact_name,
                 bodyMessage: bodyMessage,
+              };
+
+              const resultNotificationErrorUser =
+                await createNotificationErrorUserDb({
+                  notification_error_id: param.idData,
+                  contact_phone: param.userPhone,
+                  contact_name: param.userName,
+                  message_error_issue: param.bodyMessage,
+                  is_send: false,
+                });
+
+              const resultSend = await sendNotifikasi(
+                param.userPhone,
+                param.bodyMessage
+              );
+
+
+
+              await updateNotificationErrorUserDb(
+                resultNotificationErrorUser[0].notification_error_user_id,
+                {
+                  is_send: resultSend.success,
+                }
+              );
+
+              if (resultSend.success) {
+                isSendNotification = resultSend.success
               }
-
-              const tokenRedirect = await generateTokenRedirect(param.userPhone, param.userName, param.idData)
-
-              const encodedToken = encodeURIComponent(tokenRedirect);
-
-              const shortUrl = await shortUrltiny(encodedToken)
-
-              let bodyWithUrl = `${param.bodyMessage}\n🔗 ${shortUrl}`;
-
-              console.log(bodyWithUrl)
-
-              param.bodyMessage = bodyWithUrl
-
-              const resultNotificationErrorUser = await createNotificationErrorUserDb({
-                notification_error_id: resultNotificationError.notification_error_id,
-                contact_phone: param.userPhone,
-                contact_name: param.userName,
-                is_send: false,
-              });
-
-              const resultSend = await sendNotifikasi(param.userPhone, param.bodyMessage);
-
-              await updateNotificationErrorUserDb(resultNotificationErrorUser[0].notification_error_user_id, {
-                is_send: resultSend?.error ? false : true,
-              });
             }
           }
+
+          await updateNotificationErrorDb(
+            resultNotificationError.notification_error_id,
+            {
+              is_send: isSendNotification,
+              is_delivered: isSendNotification,
+            }
+          );
         }
       }
-
     } catch (error) {
       // throw new ErrorHandler(error.statusCode, error.message);
-      return error
+      return error;
     }
   }
-
 }
 
 module.exports = new NotifikasiWaService();

validate/error_code.schema.js

@@ -31,11 +31,12 @@ const insertErrorCodeSchema = Joi.object({
   is_active: Joi.boolean().default(true),
   solution: Joi.array()
     .items(solutionSchema)
-    .min(1)
+    .optional(),
-    .required()
+  // .min(1)
-    .messages({
+  // .required()
-      "array.min": "Error code must have at least 1 solution",
+  // .messages({
-    }),
+  //   "array.min": "Error code must have at least 1 solution",
+  // }),
   spareparts: Joi.array()
     .items(Joi.number().integer())
     .optional(),