Merge pull request 'Test push' (#34) from wisdom into main

Reviewed-on: #34

.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

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

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,11 +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) => {
 
@@ -24,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}`);
 
   let shortUrl = response.data;
   if (!shortUrl.startsWith('http')) {
@@ -45,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);
     // console.log(response.data);
     return response?.data
   } catch (error) {

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.route.js

@@ -26,7 +26,7 @@ router
   .get(verifyToken.verifyAccessToken, NotificationErrorController.getById)
   .put(
     verifyToken.verifyAccessToken,
-    verifyAccess(),
+    // verifyAccess(),
     NotificationErrorController.update
   );
 

routes/notification_error_log.route.js

@@ -9,7 +9,7 @@ router.route("/")
     .get(verifyToken.verifyAccessToken, NotificationErrorLogController.getAll)
     .post(
         verifyToken.verifyAccessToken,
-        verifyAccess(),
+        // verifyAccess(),
         NotificationErrorLogController.create);
 
 router.route("/:id")

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
@@ -186,7 +187,7 @@ class NotificationService {
     if (activeUsers.length < 1)
       throw new ErrorHandler(404, "No active contacts");
 
-    this._executeResendWa(
+    this._executeResendInBackground(
       id,
       activeUsers,
       deviceNotification,
@@ -198,27 +199,23 @@ class NotificationService {
     };
   }
 
-  static async _executeResendWa(
+  static async _executeResendInBackground(
     id,
     activeUsers,
     deviceNotification,
     errorCode
   ) {
-    console.log(`user active: `, id, activeUsers);
+    console.log(`process untuk ID: ${id}`);
 
     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` +
@@ -232,8 +229,6 @@ class NotificationService {
           bodyWithUrl
         );
 
-        console.log("notifikasi wa:", resultSend)
-
         const isSuccess = resultSend?.error ? false : true;
 
         await updateNotificationErrorDb(user.notification_error_id, {
@@ -253,7 +248,6 @@ class NotificationService {
     });
 
     const results = await Promise.all(sendPromises);
-    console.log("result akhir: ", results)
 
     console.log(
       `Resend chat: ${

services/notifikasi-wa.service.js

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

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