Merge pull request 'fixing verify access' (#36) from wisdom into main

Reviewed-on: #36

.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,11 +292,11 @@ 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 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

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

@@ -46,22 +46,13 @@ const sendNotifikasi = async (phone, message) => {
 
   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

@@ -15,8 +15,7 @@ const verifyAccess = (minLevel = 1, allowUnapprovedReadOnly = false) => {
       // Super Admin bypass semua
       if (user.is_sa) return next();
 
-
+      if (!isPhoneNumberID(user.user_id)) {
-      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");
 

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

@@ -173,7 +173,8 @@ class NotificationService {
 
   static async resendNotification(id) {
     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 errorCode = await getErrorCodeByIdDb(
       deviceNotification.error_code_id
@@ -234,7 +235,7 @@ class NotificationService {
         
         console.log("notifikasi wa:", resultSend)
 
-        const isSuccess = resultSend.success;
+        const isSuccess = resultSend?.error ? false : true;
 
         await updateNotificationErrorDb(user.notification_error_id, {
           is_send: isSuccess,

services/notification_error_user.service.js

@@ -152,7 +152,7 @@ class NotificationErrorUserService {
           data.contact_phone,
           bodyWithUrl
         );
-        const isSuccess = resultSend.success;
+        const isSuccess = resultSend?.error ? false : true;
 
         const updateData = {
           is_send: isSuccess,

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 {
@@ -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,10 @@ 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 ${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 +93,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 +105,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(),