Merge pull request 'wisdom' (#26) from wisdom into main

Reviewed-on: #26

.env.example

@@ -45,18 +45,4 @@ 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

.gitignore

@@ -4,3 +4,4 @@ node_modules
 request.http
 *.rest
 package-lock.json
+*.log

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

controllers/auth.controller.js

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

controllers/notification_error_user.controller.js

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

db/notification_error.db.js

@@ -46,7 +46,6 @@ const getNotificationByIdDb = async (id) => {
 const getDeviceNotificationByIdDb = async (chanel_id) => {
   const queryText = `
     SELECT 
-      brand_id,
       device_code, 
       device_name, 
       device_location, 
@@ -96,8 +95,7 @@ const getAllNotificationDb = async (searchParams = {}) => {
     ],
     queryParams
   );
-
+  if (whereParamAnd) queryParams = whereParamAnd;
-  queryParams = whereParamAnd ? whereParamAnd : queryParams;
 
   const queryText = `
     SELECT
@@ -110,12 +108,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,
@@ -131,17 +129,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 AND b.deleted_at IS NULL AND d.brand_id = b.brand_id
+        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 m_brands e
-        ON d.brand_id = e.brand_id AND e.deleted_at IS NULL
+        ON d.brand_id = e.brand_id AND d.deleted_at IS NULL
 
     WHERE a.deleted_at IS NULL
       ${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}

db/notification_error_log.db.js

@@ -32,15 +32,11 @@ const getNotificationErrorLogByIdDb = async (id) => {
 const getNotificationErrorLogByNotificationErrorIdDb = async (notificationErrorId) => {
   const queryText = `
     SELECT
-      a.notification_error_log_description,
+      a.*,
-      a.created_at,
+      b.contact_name,
-      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,4 +1,3 @@
-// db/notification_wa.db.js
 const { default: axios } = require('axios');
 const CryptoJS = require('crypto-js');
 const https = require('https');
@@ -44,24 +43,18 @@ 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 {
+    return response?.data
-      success: true,
-      statusCode: response.status,   // 200, 201, dll
-      data: response.data
-    };
   } catch (error) {
-    return {
+    // console.error(error.response?.data || error.message);
-      success: false,
+    return error.response?.data || error.message
-      statusCode: error.response?.status || null,
-      errorCode: error.code || null,  // ECONNABORTED, dll
-      message: error.response?.data || error.message
-    };
   }
 
-
 };
 
 module.exports = {

ecosystem.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      name: "bengkel-api",
+      name: "cod-api",
       script: "./index.js", // Path to your entry file
       env: {
         NODE_ENV: "development",
@@ -9,6 +9,14 @@ module.exports = {
       env_production: {
         NODE_ENV: "production",
       },
+      // Logging configuration
+      // error_file: "C:\IDETAMA\pm2-log\cod-api\cod-api-error.log",
+      // out_file: "C:\IDETAMA\pm2-log\cod-api\cod-api-out.log",
+      // log_file: "C:\IDETAMA\pm2-log\cod-api\cod-api-combined.log", // optional combined file
+      error_file: "cod-api-error.log",
+      out_file: "cod-api-out.log",
+      log_file: "cod-api-combined.log", // optional combined file
+      time: true, // adds timestamps to logs
     },
   ],
 };

middleware/verifyAccess.js

@@ -1,10 +1,6 @@
 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 {
@@ -15,8 +11,6 @@ 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");
 
@@ -33,14 +27,6 @@ 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,10 +7,7 @@ const router = express.Router();
 
 router.route("/")
     .get(verifyToken.verifyAccessToken, NotificationErrorLogController.getAll)
-    .post(
+    .post(verifyToken.verifyAccessToken, verifyAccess(), NotificationErrorLogController.create);
-        verifyToken.verifyAccessToken,
-        verifyAccess(),
-        NotificationErrorLogController.create);
 
 router.route("/:id")
     .get(verifyToken.verifyAccessToken, NotificationErrorLogController.getById);

services/error_code.service.js

@@ -119,6 +119,17 @@ 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,4 +1,3 @@
-// services/notification_error.service.js
 const {
   getAllNotificationDb,
   getNotificationByIdDb,
@@ -65,7 +64,7 @@ class NotificationService {
 
       return result;
     } catch (error) {
-      return error;
+      return error
     }
   }
 
@@ -154,6 +153,7 @@ class NotificationService {
       return  {success: true, message:"Notification has already been read"};
     }
 
+
       if (!notification.is_read) {
         const updateStatus = await updateNotificationErrorDb(
           notification_error_id,
@@ -172,94 +172,83 @@ class NotificationService {
   }
 
   static async resendNotification(id) {
+    try {
       const deviceNotification = await getNotificationByIdDb(id);
-    if (!deviceNotification) throw new ErrorHandler(404, "Data not found");
+      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(404, "No active contacts");
+        throw new ErrorHandler(
-
+          404,
-    this._executeResendWa(
+          "No active contacts found for this notification"
-      id,
+        );
-      activeUsers,
-      deviceNotification,
-      errorCode
-    ).catch((err) => console.error("Background Process Error:", err));
-
-    return {
-      count: activeUsers.length,
-    };
       }
 
-  static async _executeResendWa(
+      const results = await Promise.all(
-    id,
+        activeUsers.map(async (user) => {
-    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
+              user.notification_error_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 || "-"} - ${
+              `Terjadi peringatan dengan kode error ${
-            errorCode?.error_code_name
+                errorCode.error_code || "-"
-          } pada device ${deviceNotification.device_name || "-"}.\n` +
+              } - ${errorCode.error_code_name || "-"} ` +
-          `Silahkan cek detail pada link berikut:\n ${shortUrl}`;
+              `pada device ${
+                deviceNotification.device_name || "-"
+              }, silahkan cek detail pada link berikut:\n` +
+              `${shortUrl}`;
 
             const resultSend = await sendNotifikasi(
               user.contact_phone,
               bodyWithUrl
             );
 
-        console.log("notifikasi wa:", resultSend)
+            const isSuccess = !resultSend?.error;
-
-        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,
+              contact_name: user.contact_name,
-          status: "failed",
+              contact_phone: user.contact_phone,
-          error: err.message,
+              is_send: isSuccess,
+              is_delivered: isSuccess,
             };
+          } catch (err) {
+            return err;
           }
-    });
+        })
-
-    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}`
       );
+
+      return {
+        notification_error_id: id,
+        device_name: deviceNotification.device_name,
+        error_code: errorCode.error_code,
+        error_code_name: errorCode.error_code_name,
+        users: results,
+        message: "Berhasil mengirim ulang notifikasi",
+      };
+    } catch (err) {
+      return err;
+    }
   }
 }
 

services/notification_error_user.service.js

@@ -92,41 +92,26 @@ 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) {
-          results.push({
+        throw new ErrorHandler(404, "Data Notification Error User not found");
-            id,
-            status: "failed",
-            message: "Data Notification Error User not found",
-          });
-          continue;
       }
 
       const data = dataExist[0];
 
       if (data.contact_phone !== contact_phone) {
-          results.push({
+        throw new ErrorHandler(
-            id,
+          404,
-            status: "failed",
+          `Contact Phone with this phone ${contact_phone} not found.`
-            message: `Phone ${contact_phone} not found.`,
+        );
-          });
-          continue;
       }
 
       if (data.contact_is_active === false) {
-          results.push({
+        throw new ErrorHandler(
-            id,
+          400,
-            status: "failed",
+          `Contact Phone with this phone ${data.contact_phone} not active.`
-            message: `Contact ${data.contact_phone} not active.`,
+        );
-          });
-          continue;
       }
 
       const tokenRedirect = await generateTokenRedirect(
@@ -148,11 +133,9 @@ class NotificationErrorUserService {
         }, silahkan cek detail pada link berikut:\n` +
         `${shortUrl}`;
 
-        const resultSend = await sendNotifikasi(
+      const resultSend = await sendNotifikasi(data.contact_phone, bodyWithUrl);
-          data.contact_phone,
+
-          bodyWithUrl
+      const isSuccess = resultSend?.error ? false : true;
-        );
-        const isSuccess = resultSend.success;
 
       const updateData = {
         is_send: isSuccess,
@@ -162,34 +145,28 @@ class NotificationErrorUserService {
       await updateNotificationErrorUserDb(id, updateData);
 
       if (!isSuccess) {
-          results.push({
+        throw new ErrorHandler(
-            id,
+          500,
-            status: "failed",
+          `WhatsApp API Gagal mengirim pesan: ${
-            message: `WhatsApp API Gagal: ${
             resultSend?.message || "Unknown Error"
-            }`,
+          }`
-          });
+        );
-        } else {
+      }
-          results.push({
+
-            status: 200,
+      return {
         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,
-            },
+        short_url: shortUrl,
-          });
+        device_name: data.device_name,
-        }
+        error_code: data.error_code,
+        error_code_name: data.error_code_name,
+        message: "Berhasil mengirim ulang notifikasi",
+      };
     } catch (err) {
-        results.push({ id, status: "error", message: err.message });
+      return err
     }
   }
-    return results;
-  }
 }
 
 module.exports = NotificationErrorUserService;

services/notifikasi-wa.service.js

@@ -1,5 +1,5 @@
 const { getAllContactDb } = require("../db/contact.db");
-const { InsertNotificationErrorDb, updateNotificationErrorDb } = require("../db/notification_error.db");
+const { InsertNotificationErrorDb } = require("../db/notification_error.db");
 const {
   createNotificationErrorUserDb,
   updateNotificationErrorUserDb,
@@ -9,7 +9,7 @@ const {
   shortUrltiny,
   sendNotifikasi,
 } = require("../db/notification_wa.db");
-const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
+const { getErrorCodeByIdDb } = 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 === process.env.TOPIC_COD ?? "morek") {
+      if (topic === "morek") {
         const dataMqtt = JSON.parse(message);
 
         const resultChanel = [];
@@ -48,12 +48,11 @@ class NotifikasiWaService {
         const dataUsers = results.data;
 
         for (const chanel of resultChanel) {
+          const errorCode = await getErrorCodeByIdDb(chanel.value);
           const deviceNotification = await getDeviceNotificationByIdDb(
-            Number(chanel.chanel_id)
+            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,
@@ -65,14 +64,12 @@ class NotifikasiWaService {
 
           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.userPhone,
-                dataUser.contact_name,
+                dataUser.userName,
-                resultNotificationError.notification_error_id
+                dataUser.idData
               );
 
               const encodedToken = encodeURIComponent(tokenRedirect);
@@ -81,9 +78,12 @@ class NotifikasiWaService {
 
               const bodyMessage =
                 `Hai ${dataUser.contact_name || "-"}\n` +
-                `Terjadi kode error ${chanel?.value ?? "-"} ${errorCode?.error_code_name ?? ""}Chanel ${chanel?.chanel_id ?? "-"} ` +
+                `Terjadi peringatan dengan kode error ${
-                `pada device ${deviceNotification?.device_name ?? "berikut"
+                  errorCode?.error_code || "-"
-                }, Silahkan cek detail pada link berikut:\n` +
+                } - ${errorCode?.error_code_name || "-"} ` +
+                `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: param.idData,
+                  notification_error_id:
+                    resultNotificationError.notification_error_id,
                   contact_phone: param.userPhone,
                   contact_name: param.userName,
-                  message_error_issue: param.bodyMessage,
                   is_send: false,
                 });
 
@@ -107,29 +107,15 @@ class NotifikasiWaService {
                 param.bodyMessage
               );
 
-
-
               await updateNotificationErrorUserDb(
                 resultNotificationErrorUser[0].notification_error_user_id,
                 {
-                  is_send: resultSend.success,
+                  is_send: resultSend?.error ? false : true,
                 }
               );
-
-              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,12 +31,11 @@ const insertErrorCodeSchema = Joi.object({
   is_active: Joi.boolean().default(true),
   solution: Joi.array()
     .items(solutionSchema)
-    .optional(),
+    .min(1)
-  // .min(1)
+    .required()
-  // .required()
+    .messages({
-  // .messages({
+      "array.min": "Error code must have at least 1 solution",
-  //   "array.min": "Error code must have at least 1 solution",
+    }),
-  // }),
   spareparts: Joi.array()
     .items(Joi.number().integer())
     .optional(),