Merge pull request 'fixing is delivered notification wa' (#41) from wisdom into main

Reviewed-on: #41

.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,16 +75,13 @@ class NotificationErrorController {
   }
 
   static async resend(req, res) {
-    try {
     const { id } = req.params;
-      const result =
+    const results = await NotificationErrorService.resendNotification(id);
-        await NotificationErrorService.resendNotification(
+    const response = await setResponse(
-          id,
+      results,
+      "Notification Error resend successfully"
     );
-      res.status(200).json(result);
+    res.status(response.statusCode).json(response);
-    } catch (error) {
-      return error;
-    }
   }
 }
 

controllers/notification_error_user.controller.js

@@ -107,17 +107,16 @@ class NotificationErrorUserController {
   }
 
   static async resendByUser(req, res) {
-    try {
     const { id, contact_phone } = req.params;
-      const result =
+    const results = await NotificationErrorUserService.resendNotificationByUser(
-        await NotificationErrorUserService.resendNotificationByUser(
       id,
       contact_phone
     );
-      res.status(200).json(result);
+    const response = await setResponse(
-    } catch (error) {
+      results,
-      return error;
+      "Notification Error By User resend successfully"
-    }
+    );
+    res.status(response.statusCode).json(response);
   }
 }
 

db/notification_error.db.js

@@ -46,6 +46,7 @@ const getNotificationByIdDb = async (id) => {
 const getDeviceNotificationByIdDb = async (chanel_id) => {
   const queryText = `
     SELECT 
+      brand_id,
       device_code, 
       device_name, 
       device_location, 
@@ -95,7 +96,8 @@ const getAllNotificationDb = async (searchParams = {}) => {
     ],
     queryParams
   );
-  if (whereParamAnd) queryParams = whereParamAnd;
+
+  queryParams = whereParamAnd ? whereParamAnd : queryParams;
 
   const queryText = `
     SELECT
@@ -108,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,
@@ -129,17 +131,17 @@ const getAllNotificationDb = async (searchParams = {}) => {
 
       FROM notification_error a
 
+      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_id AND b.deleted_at IS NULL
+        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_device d
-        ON a.error_chanel = d.listen_channel AND d.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 ")}` : ""}

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_wa.db.js

@@ -1,3 +1,4 @@
+// db/notification_wa.db.js
 const { default: axios } = require('axios');
 const CryptoJS = require('crypto-js');
 const https = require('https');
@@ -43,18 +44,24 @@ const sendNotifikasi = async (phone, message) => {
 
   const endPointWhatsapp = process.env.ENDPOINT_WHATSAPP;
 
-  const response = await axios.post(endPointWhatsapp, payload, { httpsAgent });
-  // console.log('response', response);
-
   try {
     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,6 +15,8 @@ const verifyAccess = (minLevel = 1, allowUnapprovedReadOnly = false) => {
       // Super Admin bypass semua
       if (user.is_sa) return next();
 
+
+      if (!isPhoneNumberID(user.user_id) && user.user_id) {
         const fullUser = await getUserByIdDb(user.user_id);
         if (!fullUser) throw new ErrorHandler(403, "Forbidden: User not found");
 
@@ -27,6 +33,14 @@ const verifyAccess = (minLevel = 1, allowUnapprovedReadOnly = false) => {
         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");
+          }
+        }
+
+      }
 
       next();
     } catch (err) {

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) {
-      return error
+      return error;
     }
   }
 
@@ -153,7 +154,6 @@ class NotificationService {
         return { success: true, message: "Notification has already been read" };
       }
 
-
       if (!notification.is_read) {
         const updateStatus = await updateNotificationErrorDb(
           notification_error_id,
@@ -172,83 +172,95 @@ class NotificationService {
   }
 
   static async resendNotification(id) {
-    try {
     const deviceNotification = await getNotificationByIdDb(id);
-      if (!deviceNotification) {
+    if (!deviceNotification)
       throw new ErrorHandler(404, "Notification Data not found");
-      }
-
-      const errorCodeId = deviceNotification.error_code_id;
-      const errorCode = await getErrorCodeByIdDb(errorCodeId);
 
+    const errorCode = await getErrorCodeByIdDb(
+      deviceNotification.error_code_id
+    );
     const dataExist = await getUsersNotificationErrorDb(id);
+
     const activeUsers =
       dataExist?.filter((user) => user.is_active === true) || [];
 
-      if (activeUsers.length < 1) {
+    if (activeUsers.length < 1)
-        throw new ErrorHandler(
+      throw new ErrorHandler(404, "No active contacts");
-          404,
+
-          "No active contacts found for this notification"
+    this._executeResendWa(
-        );
+      id,
+      activeUsers,
+      deviceNotification,
+      errorCode
+    ).catch((err) => console.error("Background Process Error:", err));
+
+    return {
+      count: activeUsers.length,
+    };
   }
 
-      const results = await Promise.all(
+  static async _executeResendWa(
-        activeUsers.map(async (user) => {
+    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,
-              user.notification_error_id
+          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 error ${
+          `Terjadi peringatan dengan kode ${errorCode?.error_code || "-"} - ${
-                errorCode.error_code || "-"
+            errorCode?.error_code_name
-              } - ${errorCode.error_code_name || "-"} ` +
+          } pada device ${deviceNotification.device_name || "-"}.\n` +
-              `pada device ${
+          `Silahkan cek detail pada link berikut:\n ${shortUrl}`;
-                deviceNotification.device_name || "-"
-              }, silahkan cek detail pada link berikut:\n` +
-              `${shortUrl}`;
 
         const resultSend = await sendNotifikasi(
           user.contact_phone,
           bodyWithUrl
         );
         
-            const isSuccess = !resultSend?.error;
+        console.log("notifikasi wa:", resultSend)
+
+        const isSuccess = resultSend.success;
 
         await updateNotificationErrorDb(user.notification_error_id, {
           is_send: isSuccess,
           is_delivered: isSuccess,
         });
 
-            return {
+        return { phone: user.contact_phone, status: "success" };
-              contact_name: user.contact_name,
-              contact_phone: user.contact_phone,
-              is_send: isSuccess,
-              is_delivered: isSuccess,
-            };
       } catch (err) {
-            return err;
+        console.error(`Gagal mengirim ke ${user.contact_phone}:`, err.message);
+        return {
+          phone: user.contact_phone,
+          status: "failed",
+          error: err.message,
+        };
       }
-        })
+    });
-      );
 
-      return {
+    const results = await Promise.all(sendPromises);
-        notification_error_id: id,
+    console.log("result akhir: ", results)
-        device_name: deviceNotification.device_name,
+
-        error_code: errorCode.error_code,
+    console.log(
-        error_code_name: errorCode.error_code_name,
+      `Resend chat: ${
-        users: results,
+        results.filter((r) => r.status === "success").length
-        message: "Berhasil mengirim ulang notifikasi",
+      }, Gagal: ${results.filter((r) => r.status === "failed").length}`
-      };
+    );
-    } catch (err) {
-      return err;
-    }
   }
 }
 

services/notification_error_user.service.js

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

services/notifikasi-wa.service.js

@@ -1,5 +1,5 @@
 const { getAllContactDb } = require("../db/contact.db");
-const { InsertNotificationErrorDb } = require("../db/notification_error.db");
+const { InsertNotificationErrorDb, updateNotificationErrorDb } = require("../db/notification_error.db");
 const {
   createNotificationErrorUserDb,
   updateNotificationErrorUserDb,
@@ -9,7 +9,7 @@ const {
   shortUrltiny,
   sendNotifikasi,
 } = require("../db/notification_wa.db");
-const { getErrorCodeByIdDb } = require("../db/brand_code.db");
+const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
 const { getDeviceNotificationByIdDb } = require("../db/notification_error.db");
 
 class NotifikasiWaService {
@@ -29,7 +29,7 @@ class NotifikasiWaService {
       //   "c_6501": 0
       // }
 
-      if (topic === "morek") {
+      if (topic === process.env.TOPIC_COD ?? "morek") {
         const dataMqtt = JSON.parse(message);
 
         const resultChanel = [];
@@ -48,11 +48,12 @@ class NotifikasiWaService {
         const dataUsers = results.data;
 
         for (const chanel of resultChanel) {
-          const errorCode = await getErrorCodeByIdDb(chanel.value);
           const deviceNotification = await getDeviceNotificationByIdDb(
-            chanel.chanel_id
+            Number(chanel.chanel_id)
           );
 
+          const errorCode = await getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0, chanel.value);
+
           const data = {
             error_code_id: chanel.value,
             error_chanel: chanel.chanel_id,
@@ -64,12 +65,14 @@ class NotifikasiWaService {
 
           const resultNotificationError = await InsertNotificationErrorDb(data);
 
+          let isSendNotification = false
+
           for (const dataUser of dataUsers) {
             if (dataUser.is_active) {
               const tokenRedirect = await generateTokenRedirect(
-                dataUser.userPhone,
+                dataUser.contact_phone,
-                dataUser.userName,
+                dataUser.contact_name,
-                dataUser.idData
+                resultNotificationError.notification_error_id
               );
 
               const encodedToken = encodeURIComponent(tokenRedirect);
@@ -78,12 +81,9 @@ class NotifikasiWaService {
 
               const bodyMessage =
                 `Hai ${dataUser.contact_name || "-"}\n` +
-                `Terjadi peringatan dengan kode error ${
+                `Terjadi kode error ${chanel?.value ?? "-"} ${errorCode?.error_code_name ?? ""}Chanel ${chanel?.chanel_id ?? "-"} ` +
-                  errorCode?.error_code || "-"
+                `pada device ${deviceNotification?.device_name ?? "berikut"
-                } - ${errorCode?.error_code_name || "-"} ` +
+                }, Silahkan cek detail pada link berikut:\n` +
-                `pada device ${
-                  deviceNotification?.device_name || "-"
-                }, silahkan cek detail pada link berikut:\n` +
                 `${shortUrl}`;
 
               const param = {
@@ -95,10 +95,10 @@ class NotifikasiWaService {
 
               const resultNotificationErrorUser =
                 await createNotificationErrorUserDb({
-                  notification_error_id:
+                  notification_error_id: param.idData,
-                    resultNotificationError.notification_error_id,
                   contact_phone: param.userPhone,
                   contact_name: param.userName,
+                  message_error_issue: param.bodyMessage,
                   is_send: false,
                 });
 
@@ -107,15 +107,29 @@ class NotifikasiWaService {
                 param.bodyMessage
               );
 
+
+
               await updateNotificationErrorUserDb(
                 resultNotificationErrorUser[0].notification_error_user_id,
                 {
-                  is_send: resultSend?.error ? false : true,
+                  is_send: resultSend.success,
                 }
               );
+
+              if (resultSend.success) {
+                isSendNotification = resultSend.success
               }
             }
           }
+
+          await updateNotificationErrorDb(
+            resultNotificationError.notification_error_id,
+            {
+              is_send: isSendNotification,
+              is_delivered: isSendNotification,
+            }
+          );
+        }
       }
     } catch (error) {
       // throw new ErrorHandler(error.statusCode, error.message);

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(),