Merge pull request 'connect mqtt ws colo' (#38) from wisdom into main

Reviewed-on: #38

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: 'morekmorekmorek', // jika ada
-  password: '', // jika ada
+  password: 'morek888', // jika ada
 };
 
-const mqttUrl = 'ws://localhost:1884'; // Ganti dengan broker kamu
+const mqttUrl = 'ws://117.102.231.130:7001'; // Ganti dengan broker kamu
-const topic = 'morek';
+const topic = process.env.TOPIC_COD ?? 'morek';
 
 const mqttClient = mqtt.connect(mqttUrl, mqttOptions);
 

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');
@@ -23,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}`,{ httpsAgent });
+  const response = await axios.get(`https://tinyurl.com/api-create.php?url=${encodedUrl}`,{httpsAgent}) ;
 
   let shortUrl = response.data;
   if (!shortUrl.startsWith('http')) {
@@ -44,7 +45,7 @@ const sendNotifikasi = async (phone, message) => {
   const endPointWhatsapp = process.env.ENDPOINT_WHATSAPP;
 
   try {
-    const response = await axios.post(endPointWhatsapp, payload, { httpsAgent });
+    const response = await axios.post(endPointWhatsapp, payload,{httpsAgent} );
     // console.log(response.data);
     return response?.data
   } catch (error) {

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,
@@ -172,59 +173,95 @@ class NotificationService {
 
   static async resendNotification(id) {
     const deviceNotification = await getNotificationByIdDb(id);
-    if (!deviceNotification) throw new ErrorHandler(404, "Notification Data not found");
+    if (!deviceNotification)
+      throw new ErrorHandler(404, "Notification Data not found");
 
-    const errorCode = await getErrorCodeByIdDb(deviceNotification.error_code_id);
+    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) {
+    const activeUsers =
-        throw new ErrorHandler(404, "No active contacts found");
+      dataExist?.filter((user) => user.is_active === true) || [];
-    }
 
-    this._executeResendInBackground(id, activeUsers, deviceNotification, errorCode)
+    if (activeUsers.length < 1)
-        .catch(err => console.error("Background Resend Error:", err));
+      throw new ErrorHandler(404, "No active contacts");
+
+    this._executeResendWa(
+      id,
+      activeUsers,
+      deviceNotification,
+      errorCode
+    ).catch((err) => console.error("Background Process Error:", err));
 
     return {
-        message: "Notification Error resend has prosseced",
+      count: activeUsers.length,
-        total_users: activeUsers.length,
-        status: true
     };
-}
+  }
 
-static async _executeResendInBackground(id, activeUsers, deviceNotification, errorCode) {
+  static async _executeResendWa(
-    const batchSize = 100;
+    id,
-    
+    activeUsers,
-    for (let i = 0; i < activeUsers.length; i += batchSize) {
+    deviceNotification,
-        const batch = activeUsers.slice(i, i + batchSize);
+    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
+        );
         
-        await Promise.all(batch.map(async (user) => {
+        console.log("notifikasi wa:", resultSend)
-            try {
-                const tokenRedirect = await generateTokenRedirect(user.contact_phone, user.contact_name, id);
-                const encodedToken = encodeURIComponent(tokenRedirect);
-                const shortUrl = await shortUrltiny(encodedToken);
 
-                const bodyWithUrl = 
+        const isSuccess = resultSend?.error ? false : true;
-                    `Hai ${user.contact_name || "-"}\n` +
-                    `Terjadi peringatan dengan kode error ${errorCode?.error_code || "-"} - ${errorCode?.error_code_name || "-"} ` +
-                    `pada device ${deviceNotification.device_name || "-"}, silahkan cek detail pada link berikut:\n` +
-                    `${shortUrl}`;
 
-                const resultSend = await sendNotifikasi(user.contact_phone, bodyWithUrl);
+        await updateNotificationErrorDb(user.notification_error_id, {
-                const isSuccess = !resultSend?.error;
+          is_send: isSuccess,
+          is_delivered: isSuccess,
+        });
 
-                await updateNotificationErrorDb(user.notification_error_id, {
+        return { phone: user.contact_phone, status: "success" };
-                    is_send: isSuccess,
+      } catch (err) {
-                    is_delivered: isSuccess,
+        console.error(`Gagal mengirim ke ${user.contact_phone}:`, err.message);
-                });
+        return {
-            } catch (err) {
+          phone: user.contact_phone,
-                console.error(`Error sending to ${user.contact_phone}:`, err.message);
+          status: "failed",
-            }
+          error: err.message,
-        }));
+        };
-        
+      }
-        await new Promise(resolve => setTimeout(resolve, 500));
+    });
-    }
+
-}
+    const results = await Promise.all(sendPromises);
+    console.log("result akhir: ", results)
+
+    console.log(
+      `Resend chat: ${
+        results.filter((r) => r.status === "success").length
+      }, Gagal: ${results.filter((r) => r.status === "failed").length}`
+    );
+  }
 }
 
 module.exports = NotificationService;

services/notifikasi-wa.service.js

@@ -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 = [];
@@ -69,7 +69,7 @@ class NotifikasiWaService {
               const tokenRedirect = await generateTokenRedirect(
                 dataUser.userPhone,
                 dataUser.userName,
-                dataUser.idData
+                resultNotificationError.notification_error_id
               );
 
               const encodedToken = encodeURIComponent(tokenRedirect);
@@ -78,11 +78,9 @@ class NotifikasiWaService {
 
               const bodyMessage =
                 `Hai ${dataUser.contact_name || "-"}\n` +
-                `Terjadi peringatan dengan kode error ${
+                `Terjadi peringatan dengan kode error ${errorCode?.error_code || "-"
-                  errorCode?.error_code || "-"
                 } - ${errorCode?.error_code_name || "-"} ` +
-                `pada device ${
+                `pada device ${deviceNotification?.device_name || "-"
-                  deviceNotification?.device_name || "-"
                 }, silahkan cek detail pada link berikut:\n` +
                 `${shortUrl}`;
 

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