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

Reviewed-on: #39

.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

db/notification_error.db.js

@@ -95,7 +95,8 @@ const getAllNotificationDb = async (searchParams = {}) => {
     ],
     queryParams
   );
-  if (whereParamAnd) queryParams = whereParamAnd;
+  
+   queryParams = whereParamAnd ? whereParamAnd : queryParams;
 
   const queryText = `
     SELECT
@@ -108,12 +109,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,

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,10 +1,11 @@
+// db/notification_wa.db.js
 const { default: axios } = require('axios');
 const CryptoJS = require('crypto-js');
-// const https = require('https');
+const https = require('https');
 
-// const httpsAgent = new https.Agent({
+const httpsAgent = new https.Agent({
-//   rejectUnauthorized: false,
+  rejectUnauthorized: false,
-// });
+});
 
 const generateTokenRedirect = async (userPhone, userName, id) => {
 
@@ -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}`);
+  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);
+    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,
@@ -186,32 +187,39 @@ class NotificationService {
     if (activeUsers.length < 1)
       throw new ErrorHandler(404, "No active contacts");
 
-    this._executeResendWA(id, activeUsers, deviceNotification, errorCode).catch(
+    this._executeResendWa(
-      (err) => console.error("process error:", err)
+      id,
-    );
+      activeUsers,
+      deviceNotification,
+      errorCode
+    ).catch((err) => console.error("Background Process Error:", err));
 
     return {
       count: activeUsers.length,
     };
   }
 
-  static async _executeResendWA(
+  static async _executeResendWa(
     id,
     activeUsers,
     deviceNotification,
     errorCode
   ) {
-    console.log(`process id: ${id}`);
+    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` +
@@ -224,6 +232,8 @@ class NotificationService {
           user.contact_phone,
           bodyWithUrl
         );
+        
+        console.log("notifikasi wa:", resultSend)
 
         const isSuccess = resultSend?.error ? false : true;
 
@@ -232,10 +242,9 @@ class NotificationService {
           is_delivered: isSuccess,
         });
 
-        return { phone: user.contact_phone, status: true };
+        return { phone: user.contact_phone, status: "success" };
       } catch (err) {
-
+        console.error(`Gagal mengirim ke ${user.contact_phone}:`, err.message);
-        console.log(`Gagal mengirim ke ${user.contact_phone}:`, err.message);
         return {
           phone: user.contact_phone,
           status: "failed",
@@ -245,11 +254,12 @@ class NotificationService {
     });
 
     const results = await Promise.all(sendPromises);
+    console.log("result akhir: ", results)
 
     console.log(
-      `Notification resend has been succesfully: ${
+      `Resend chat: ${
         results.filter((r) => r.status === "success").length
-      }, Error: ${results.filter((r) => r.status === "failed").length}`
+      }, Gagal: ${results.filter((r) => r.status === "failed").length}`
     );
   }
 }

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 = [];
@@ -67,9 +67,9 @@ class NotifikasiWaService {
           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,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}`;
 
@@ -107,6 +105,8 @@ class NotifikasiWaService {
                 param.bodyMessage
               );
 
+              console.log("resultSend: ", resultSend);
+
               await updateNotificationErrorUserDb(
                 resultNotificationErrorUser[0].notification_error_user_id,
                 {

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