Merge pull request 'repair: notification error log created_by' (#21) from wisdom into main

Reviewed-on: #21

.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

@@ -25,6 +25,7 @@ class NotificationErrorController {
     res.status(response.statusCode).json(response);
   }
 
+
   static async getById(req, res) {
     const { id } = req.params;
 
@@ -49,10 +50,7 @@ class NotificationErrorController {
     const results = await NotificationErrorService.createNotificationError(
       value
     );
-    const response = await setResponse(
+    const response = await setResponse(results, "Notification created successfully");
-      results,
-      "Notification created successfully"
-    );
 
     return res.status(response.statusCode).json(response);
   }
@@ -60,27 +58,17 @@ class NotificationErrorController {
   static async update(req, res) {
     const { id } = req.params;
 
-    const userId = req.user.user_id;
+    const { error, value } = checkValidate(updateNotificationSchema, req)
 
-    const results = await NotificationErrorService.updateNotificationError(
+    if (error) {
-      id,
+      return res.status(400).json(setResponse(error, 'Validation failed', 400));
-      userId
+    }
-    );
-    const response = await setResponse(
-      results,
-      "Notification Error updated successfully"
-    );
 
-    res.status(response.statusCode).json(response);
+    value.userId = req.user.user_id
-  }
+
+    const results = await NotificationErrorService.updateNotificationError(id, value);
+    const response = await setResponse(results, 'Notification Error User updated successfully')
 
-  static async resend(req, res) {
-    const { id } = req.params;
-    const results = await NotificationErrorService.resendNotification(id);
-    const response = await setResponse(
-      results,
-      "Notification Error resend successfully"
-    );
     res.status(response.statusCode).json(response);
   }
 }

controllers/notification_error_user.controller.js

@@ -1,28 +1,14 @@
-const NotificationErrorUserService = require("../services/notification_error_user.service");
+const NotificationErrorUserService = require('../services/notification_error_user.service');
-const {
+const { setResponse, setResponsePaging, checkValidate } = require('../helpers/utils');
-  setResponse,
+const { insertNotificationErrorUserSchema, updateNotificationErrorUserSchema } = require('../validate/notification_error_user.schema');
-  setResponsePaging,
-  checkValidate,
-} = require("../helpers/utils");
-const {
-  insertNotificationErrorUserSchema,
-  updateNotificationErrorUserSchema,
-} = require("../validate/notification_error_user.schema");
 
 class NotificationErrorUserController {
   // Get all NotificationErrorUser
   static async getAll(req, res) {
     const queryParams = req.query;
 
-    const results =
+    const results = await NotificationErrorUserService.getAllNotificationErrorUser(queryParams);
-      await NotificationErrorUserService.getAllNotificationErrorUser(
+    const response = await setResponsePaging(queryParams, results, 'Notification Error User found')
-        queryParams
-      );
-    const response = await setResponsePaging(
-      queryParams,
-      results,
-      "Notification Error User found"
-    );
 
     res.status(response.statusCode).json(response);
   }
@@ -31,35 +17,24 @@ class NotificationErrorUserController {
   static async getById(req, res) {
     const { id } = req.params;
 
-    const results =
+    const results = await NotificationErrorUserService.getNotificationErrorUserById(id);
-      await NotificationErrorUserService.getNotificationErrorUserById(id);
+    const response = await setResponse(results, 'Notification Error User found')
-    const response = await setResponse(
-      results,
-      "Notification Error User found"
-    );
 
     res.status(response.statusCode).json(response);
   }
 
   // Create NotificationErrorUser
   static async create(req, res) {
-    const { error, value } = await checkValidate(
+    const { error, value } = await checkValidate(insertNotificationErrorUserSchema, req)
-      insertNotificationErrorUserSchema,
-      req
-    );
 
     if (error) {
-      return res.status(400).json(setResponse(error, "Validation failed", 400));
+      return res.status(400).json(setResponse(error, 'Validation failed', 400));
     }
 
-    value.userId = req.user.user_id;
+    value.userId = req.user.user_id
 
-    const results =
+    const results = await NotificationErrorUserService.createNotificationErrorUser(value);
-      await NotificationErrorUserService.createNotificationErrorUser(value);
+    const response = await setResponse(results, 'Notification Error User created successfully')
-    const response = await setResponse(
-      results,
-      "Notification Error User created successfully"
-    );
 
     return res.status(response.statusCode).json(response);
   }
@@ -68,23 +43,16 @@ class NotificationErrorUserController {
   static async update(req, res) {
     const { id } = req.params;
 
-    const { error, value } = checkValidate(
+    const { error, value } = checkValidate(updateNotificationErrorUserSchema, req)
-      updateNotificationErrorUserSchema,
-      req
-    );
 
     if (error) {
-      return res.status(400).json(setResponse(error, "Validation failed", 400));
+      return res.status(400).json(setResponse(error, 'Validation failed', 400));
     }
 
-    value.userId = req.user.user_id;
+    value.userId = req.user.user_id
 
-    const results =
+    const results = await NotificationErrorUserService.updateNotificationErrorUser(id, value);
-      await NotificationErrorUserService.updateNotificationErrorUser(id, value);
+    const response = await setResponse(results, 'Notification Error User updated successfully')
-    const response = await setResponse(
-      results,
-      "Notification Error User updated successfully"
-    );
 
     res.status(response.statusCode).json(response);
   }
@@ -93,31 +61,11 @@ class NotificationErrorUserController {
   static async delete(req, res) {
     const { id } = req.params;
 
-    const results =
+    const results = await NotificationErrorUserService.deleteNotificationErrorUser(id, req.user.user_id);
-      await NotificationErrorUserService.deleteNotificationErrorUser(
+    const response = await setResponse(results, 'Notification Error User deleted successfully')
-        id,
-        req.user.user_id
-      );
-    const response = await setResponse(
-      results,
-      "Notification Error User deleted successfully"
-    );
 
     res.status(response.statusCode).json(response);
   }
-
-  static async resendByUser(req, res) {
-    const { id, contact_phone } = req.params;
-    const results = await NotificationErrorUserService.resendNotificationByUser(
-      id,
-      contact_phone
-    );
-    const response = await setResponse(
-      results,
-      "Notification Error By User resend successfully"
-    );
-    res.status(response.statusCode).json(response);
-  }
 }
 
 module.exports = NotificationErrorUserController;

db/notification_error.db.js

@@ -43,22 +43,6 @@ const getNotificationByIdDb = async (id) => {
   return result.recordset[0];
 };
 
-const getDeviceNotificationByIdDb = async (chanel_id) => {
-  const queryText = `
-    SELECT 
-      device_code, 
-      device_name, 
-      device_location, 
-      listen_channel 
-
-    FROM m_device 
-    WHERE listen_channel = $1 
-    AND deleted_at IS NULL 
-  `;
-  const result = await pool.query(queryText, [chanel_id]);
-  return result.recordset[0];
-};
-
 
 const getAllNotificationDb = async (searchParams = {}) => {
   let queryParams = [];
@@ -95,8 +79,7 @@ const getAllNotificationDb = async (searchParams = {}) => {
     ],
     queryParams
   );
-  
+  if (whereParamAnd) queryParams = whereParamAnd;
-   queryParams = whereParamAnd ? whereParamAnd : queryParams;
 
   const queryText = `
     SELECT
@@ -109,12 +92,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,
@@ -182,16 +165,12 @@ const getUsersNotificationErrorDb = async (id) => {
       a.notification_error_user_id,
       a.contact_phone,
       a.contact_name,
-      a.is_send,
+      a.is_send
-      a.updated_at,
-      c.is_active
 
     FROM notification_error_user a
 
     LEFT JOIN notification_error b ON a.notification_error_id = b.notification_error_id
     
-    LEFT JOIN contact c ON a.contact_phone = c.contact_phone
-    
     WHERE a.notification_error_id = $1 
       AND a.deleted_at IS NULL
   `;
@@ -202,7 +181,6 @@ const getUsersNotificationErrorDb = async (id) => {
 
 module.exports = {
   getNotificationByIdDb,
-  getDeviceNotificationByIdDb,
   getAllNotificationDb,
   InsertNotificationErrorDb,
   updateNotificationErrorDb,

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_error_user.db.js

@@ -10,7 +10,10 @@ const getAllNotificationErrorUserDb = async (searchParams = {}) => {
   }
 
   const { whereOrConditions, whereParamOr } = pool.buildStringOrIlike(
-    ["a.notification_error_id", "a.contact_id"],
+    [
+      "a.notification_error_id",
+      "a.contact_id",
+    ],
     searchParams.criteria,
     queryParams
   );
@@ -19,11 +22,7 @@ const getAllNotificationErrorUserDb = async (searchParams = {}) => {
 
   const { whereConditions, whereParamAnd } = pool.buildFilterQuery(
     [
-      {
+      { column: "a.notification_error_id", param: searchParams.name, type: "int" },
-        column: "a.notification_error_id",
-        param: searchParams.name,
-        type: "int",
-      },
       { column: "a.contact_id", param: searchParams.code, type: "int" },
     ],
     queryParams
@@ -37,14 +36,10 @@ const getAllNotificationErrorUserDb = async (searchParams = {}) => {
       a.*
     FROM notification_error_user a
     WHERE a.deleted_at IS NULL
-      ${
+      ${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}
-        whereConditions.length > 0
-          ? ` AND ${whereConditions.join(" AND ")}`
-          : ""
-      }
       ${whereOrConditions ? ` ${whereOrConditions}` : ""}
     ORDER BY a.notification_error_user_id ASC
-     ${searchParams.limit ? `OFFSET $2 * $1 ROWS FETCH NEXT $1 ROWS ONLY` : ""}
+     ${searchParams.limit ? `OFFSET $2 * $1 ROWS FETCH NEXT $1 ROWS ONLY` : ''}
   `;
 
   const result = await pool.query(queryText, queryParams);
@@ -60,52 +55,16 @@ const getAllNotificationErrorUserDb = async (searchParams = {}) => {
 const getNotificationErrorUserByIdDb = async (id) => {
   const queryText = `
     SELECT 
-      a.*,
+      a.*
-
-      b. is_active as contact_is_active,
-
-      d.error_code,
-      d.error_code_name,
-
-      e.device_name
-      
     FROM notification_error_user a
-    
-    LEFT JOIN contact b ON a.contact_phone = b.contact_phone
-
-    LEFT JOIN notification_error c ON a.notification_error_id = c.notification_error_id
-
-    LEFT JOIN brand_code d ON d.error_code_id = c.error_code_id
-
-    LEFT JOIN m_device e ON c.error_chanel = e.listen_channel
-
     WHERE a.notification_error_user_id = $1 AND a.deleted_at IS NULL
   `;
   const result = await pool.query(queryText, [id]);
   return result.recordset;
 };
 
-const getNotificationErrorByIdDb = async (notification_error_id) => {
-  const queryText = `
-    SELECT 
-      a.*,
-      b.is_active as contact_is_active,
-      c.is_read
-      
-    FROM notification_error_user a
-    LEFT JOIN contact b ON a.contact_phone = b.contact_phone
-    LEFT JOIN notification_error c ON a.notification_error_id = c.notification_error_id
-    WHERE a.notification_error_id = $1 AND a.deleted_at IS NULL
-  `;
-  const result = await pool.query(queryText, [notification_error_id]);
-  return result.recordset;
-};
-
 const createNotificationErrorUserDb = async (store) => {
-  const { query: queryText, values } = pool.buildDynamicInsert(
+  const { query: queryText, values } = pool.buildDynamicInsert("notification_error_user", store);
-    "notification_error_user",
-    store
-  );
   const result = await pool.query(queryText, values);
   const insertedId = result.recordset?.[0]?.inserted_id;
 
@@ -140,7 +99,6 @@ const deleteNotificationErrorUserDb = async (id, deletedBy) => {
 module.exports = {
   getAllNotificationErrorUserDb,
   getNotificationErrorUserByIdDb,
-  getNotificationErrorByIdDb,
   createNotificationErrorUserDb,
   updateNotificationErrorUserDb,
   deleteNotificationErrorUserDb,

db/notification_wa.db.js

@@ -1,11 +1,5 @@
-// db/notification_wa.db.js
 const { default: axios } = require('axios');
 const CryptoJS = require('crypto-js');
-const https = require('https');
-
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-});
 
 const generateTokenRedirect = async (userPhone, userName, id) => {
 
@@ -24,7 +18,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')) {
@@ -44,8 +38,11 @@ const sendNotifikasi = async (phone, message) => {
 
   const endPointWhatsapp = process.env.ENDPOINT_WHATSAPP;
 
+  const response = await axios.post(endPointWhatsapp, payload);
+  // console.log('response', response);
+
   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,31 +11,21 @@ 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 (!isPhoneNumberID(user.user_id) && user.user_id) {
+      if (!fullUser.is_approve) {
-        const fullUser = await getUserByIdDb(user.user_id);
+        if (req.method !== "GET") {
-        if (!fullUser) throw new ErrorHandler(403, "Forbidden: User not found");
+          throw new ErrorHandler(403, "Account not approved — read-only access");
-
-        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 (!fullUser.role_level || fullUser.role_level < minLevel) {
+        if (allowUnapprovedReadOnly) return next();
-          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.route.js

@@ -1,40 +1,21 @@
-const express = require("express");
+const express = require('express');
-const NotificationErrorController = require("../controllers/notification_error.controller");
+const NotificationErrorController = require('../controllers/notification_error.controller');
-const verifyToken = require("../middleware/verifyToken");
+const verifyToken = require('../middleware/verifyToken');
-const verifyAccess = require("../middleware/verifyAccess");
+const verifyAccess = require('../middleware/verifyAccess');
 
 const router = express.Router();
 
 router
-  .route("/")
+  .route('/')
-  .get(
+  .get(verifyToken.verifyAccessToken,verifyAccess(), NotificationErrorController.getAll)
-    verifyToken.verifyAccessToken,
+
-    verifyAccess(),
+  router
-    NotificationErrorController.getAll
+  .route('/')
-  );
+  .post(verifyToken.verifyAccessToken,verifyAccess(), NotificationErrorController.create)
 
 router
-  .route("/")
+  .route('/:id')
-  .post(
-    verifyToken.verifyAccessToken,
-    verifyAccess(),
-    NotificationErrorController.create
-  );
-
-router
-  .route("/:id")
   .get(verifyToken.verifyAccessToken, NotificationErrorController.getById)
-  .put(
+  .put(verifyToken.verifyAccessToken, verifyAccess(), NotificationErrorController.update)
-    verifyToken.verifyAccessToken,
-    verifyAccess(),
-    NotificationErrorController.update
-  );
-
-router.post(
-  "/resend/:id",
-  verifyToken.verifyAccessToken,
-  verifyAccess(),
-  NotificationErrorController.resend
-);
 
 module.exports = router;

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);

routes/notification_error_user.route.js

@@ -1,38 +1,17 @@
-const express = require("express");
+const express = require('express');
-const NotificationErrorUserController = require("../controllers/notification_error_user.controller");
+const NotificationErrorUserController = require('../controllers/notification_error_user.controller');
-const verifyToken = require("../middleware/verifyToken");
+const verifyToken = require("../middleware/verifyToken")
-const verifyAccess = require("../middleware/verifyAccess");
+const verifyAccess = require("../middleware/verifyAccess")
 
 const router = express.Router();
 
-router
+router.route("/")
-  .route("/")
+    .get(verifyToken.verifyAccessToken, NotificationErrorUserController.getAll)
-  .get(verifyToken.verifyAccessToken, NotificationErrorUserController.getAll)
+    .post(verifyToken.verifyAccessToken, verifyAccess(), NotificationErrorUserController.create);
-  .post(
-    verifyToken.verifyAccessToken,
-    verifyAccess(),
-    NotificationErrorUserController.create
-  );
 
-router
+router.route("/:id")
-  .route("/:id")
+    .get(verifyToken.verifyAccessToken, NotificationErrorUserController.getById)
-  .get(verifyToken.verifyAccessToken, NotificationErrorUserController.getById)
+    .put(verifyToken.verifyAccessToken, verifyAccess(), NotificationErrorUserController.update)
-  .put(
+    .delete(verifyToken.verifyAccessToken, verifyAccess(), NotificationErrorUserController.delete);
-    verifyToken.verifyAccessToken,
-    verifyAccess(),
-    NotificationErrorUserController.update
-  )
-  .delete(
-    verifyToken.verifyAccessToken,
-    verifyAccess(),
-    NotificationErrorUserController.delete
-  );
-
-router.post(
-  "/resend/:id/:contact_phone",
-  verifyToken.verifyAccessToken,
-  verifyAccess(),
-  NotificationErrorUserController.resendByUser
-);
 
 module.exports = router;

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,
@@ -18,18 +17,8 @@ const {
 
 const { getSparepartsByErrorCodeIdDb } = require("../db/brand_sparepart.db");
 
-const {
-  getNotificationErrorByIdDb,
-} = require("../db/notification_error_user.db");
-
 const { getFileUploadByPathDb } = require("../db/file_uploads.db");
 
-const {
-  generateTokenRedirect,
-  shortUrltiny,
-  sendNotifikasi,
-} = require("../db/notification_wa.db");
-
 const { ErrorHandler } = require("../helpers/error");
 
 class NotificationService {
@@ -40,10 +29,7 @@ class NotificationService {
       if (results && Array.isArray(results.data)) {
         results.data = await Promise.all(
           results.data.map(async (notification) => {
-            const usersNotification =
+            const usersNotification = (await getUsersNotificationErrorDb(notification.notification_error_id)) || [];
-              (await getUsersNotificationErrorDb(
-                notification.notification_error_id
-              )) || [];
             return {
               ...notification,
               users: usersNotification,
@@ -65,7 +51,7 @@ class NotificationService {
 
       return result;
     } catch (error) {
-      return error;
+      throw new ErrorHandler(error.statusCode, error.message);
     }
   }
 
@@ -140,127 +126,23 @@ class NotificationService {
     }
   }
 
-  static async updateNotificationError(notification_error_id, data) {
+  static async updateNotificationError(id, data) {
     try {
-      const dataExist = await getNotificationErrorByIdDb(notification_error_id);
+      if (!data || typeof data !== "object") data = {};
 
-      if (!dataExist || (Array.isArray(dataExist) && dataExist.length < 1)) {
+      const dataExist = await getNotificationByIdDb(id);
-        throw new ErrorHandler(404, "Notification Error User not found");
+
+      if (dataExist.length < 1) {
+        throw new ErrorHandler(404, "NotificationErrorUser not found");
       }
 
-      const notification = Array.isArray(dataExist) ? dataExist[0] : dataExist;
+      const result = await updateNotificationErrorDb(id, data);
 
-      if (notification.is_read === true) {
+      return result;
-        return { success: true, message: "Notification has already been read" };
-      }
-
-      if (!notification.is_read) {
-        const updateStatus = await updateNotificationErrorDb(
-          notification_error_id,
-          { is_read: true }
-        );
-
-        if (!updateStatus) {
-          throw new ErrorHandler(500, "Failed to update notification");
-        }
-      }
-
-      return { success: true, message: "Notification marked as read" };
     } catch (error) {
-      throw new ErrorHandler(error.statusCode || 500, error.message);
+      throw new ErrorHandler(error.statusCode, error.message);
     }
   }
-
-  static async resendNotification(id) {
-    const deviceNotification = await getNotificationByIdDb(id);
-    if (!deviceNotification) throw new ErrorHandler(404, "Data not found");
-
-    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)
-      throw new ErrorHandler(404, "No active contacts");
-
-    this._executeResendWa(
-      id,
-      activeUsers,
-      deviceNotification,
-      errorCode
-    ).catch((err) => console.error("Background Process Error:", err));
-
-    return {
-      count: activeUsers.length,
-    };
-  }
-
-  static async _executeResendWa(
-    id,
-    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
-        );
-
-        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
-        );
-        
-        console.log("notifikasi wa:", resultSend)
-
-        const isSuccess = resultSend?.error ? false : true;
-
-        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,
-          status: "failed",
-          error: err.message,
-        };
-      }
-    });
-
-    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/notification_error_user.service.js

@@ -3,16 +3,9 @@ const {
   getNotificationErrorUserByIdDb,
   createNotificationErrorUserDb,
   updateNotificationErrorUserDb,
-  deleteNotificationErrorUserDb,
+  deleteNotificationErrorUserDb
-} = require("../db/notification_error_user.db");
+} = require('../db/notification_error_user.db');
-
+const { ErrorHandler } = require('../helpers/error');
-const {
-  generateTokenRedirect,
-  shortUrltiny,
-  sendNotifikasi,
-} = require("../db/notification_wa.db");
-
-const { ErrorHandler } = require("../helpers/error");
 
 class NotificationErrorUserService {
   // Get all Contact
@@ -20,9 +13,10 @@ class NotificationErrorUserService {
     try {
       const results = await getAllNotificationErrorUserDb(param);
 
-      results.data.map((element) => {});
+      results.data.map(element => {
+      });
 
-      return results;
+      return results
     } catch (error) {
       throw new ErrorHandler(error.statusCode, error.message);
     }
@@ -33,8 +27,7 @@ class NotificationErrorUserService {
     try {
       const result = await getNotificationErrorUserByIdDb(id);
 
-      if (result.length < 1)
+      if (result.length < 1) throw new ErrorHandler(404, 'NotificationErrorUser not found');
-        throw new ErrorHandler(404, "Notification Error User not found");
 
       return result;
     } catch (error) {
@@ -45,7 +38,7 @@ class NotificationErrorUserService {
   // Create NotificationErrorUser
   static async createNotificationErrorUser(data) {
     try {
-      if (!data || typeof data !== "object") data = {};
+      if (!data || typeof data !== 'object') data = {};
 
       const result = await createNotificationErrorUserDb(data);
 
@@ -58,12 +51,12 @@ class NotificationErrorUserService {
   // Update NotificationErrorUser
   static async updateNotificationErrorUser(id, data) {
     try {
-      if (!data || typeof data !== "object") data = {};
+      if (!data || typeof data !== 'object') data = {};
 
       const dataExist = await getNotificationErrorUserByIdDb(id);
 
       if (dataExist.length < 1) {
-        throw new ErrorHandler(404, "Notification Error User not found");
+        throw new ErrorHandler(404, 'NotificationErrorUser not found');
       }
 
       const result = await updateNotificationErrorUserDb(id, data);
@@ -80,7 +73,7 @@ class NotificationErrorUserService {
       const dataExist = await getNotificationErrorUserByIdDb(id);
 
       if (dataExist.length < 1) {
-        throw new ErrorHandler(404, "Notification Error User not found");
+        throw new ErrorHandler(404, 'NotificationErrorUser not found');
       }
 
       const result = await deleteNotificationErrorUserDb(id, userId);
@@ -90,106 +83,6 @@ class NotificationErrorUserService {
       throw new ErrorHandler(error.statusCode, error.message);
     }
   }
-
-  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({
-            id,
-            status: "failed",
-            message: "Data Notification Error User not found",
-          });
-          continue;
-        }
-
-        const data = dataExist[0];
-
-        if (data.contact_phone !== contact_phone) {
-          results.push({
-            id,
-            status: "failed",
-            message: `Phone ${contact_phone} not found.`,
-          });
-          continue;
-        }
-
-        if (data.contact_is_active === false) {
-          results.push({
-            id,
-            status: "failed",
-            message: `Contact ${data.contact_phone} not active.`,
-          });
-          continue;
-        }
-
-        const tokenRedirect = await generateTokenRedirect(
-          data.contact_phone,
-          data.contact_name,
-          data.notification_error_id
-        );
-
-        const encodedToken = encodeURIComponent(tokenRedirect);
-        const shortUrl = await shortUrltiny(encodedToken);
-
-        const bodyWithUrl =
-          `Hai ${data.contact_name || "-"}\n` +
-          `Terjadi peringatan dengan kode error ${data.error_code || "-"} - ${
-            data.error_code_name || "-"
-          } ` +
-          `pada device ${
-            data.device_name || "-"
-          }, silahkan cek detail pada link berikut:\n` +
-          `${shortUrl}`;
-
-        const resultSend = await sendNotifikasi(
-          data.contact_phone,
-          bodyWithUrl
-        );
-        const isSuccess = resultSend?.error ? false : true;
-
-        const updateData = {
-          is_send: isSuccess,
-          message_error_issue: bodyWithUrl,
-        };
-
-        await updateNotificationErrorUserDb(id, updateData);
-
-        if (!isSuccess) {
-          results.push({
-            id,
-            status: "failed",
-            message: `WhatsApp API Gagal: ${
-              resultSend?.message || "Unknown Error"
-            }`,
-          });
-        } else {
-          results.push({
-            status: 200,
-            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,
-            },
-          });
-        }
-      } catch (err) {
-        results.push({ id, status: "error", message: err.message });
-      }
-    }
-    return results;
-  }
 }
 
 module.exports = NotificationErrorUserService;

services/notifikasi-wa.service.js

@@ -1,26 +1,19 @@
-const { getAllContactDb } = require("../db/contact.db");
+const { getAllContactDb } = require('../db/contact.db');
-const { InsertNotificationErrorDb } = require("../db/notification_error.db");
+const { InsertNotificationErrorDb } = require('../db/notification_error.db');
-const {
+const { createNotificationErrorUserDb, updateNotificationErrorUserDb } = require('../db/notification_error_user.db');
-  createNotificationErrorUserDb,
+const { generateTokenRedirect, shortUrltiny, sendNotifikasi } = require('../db/notification_wa.db');
-  updateNotificationErrorUserDb,
-} = require("../db/notification_error_user.db");
-const {
-  generateTokenRedirect,
-  shortUrltiny,
-  sendNotifikasi,
-} = require("../db/notification_wa.db");
-const { getErrorCodeByIdDb } = require("../db/brand_code.db");
-const { getDeviceNotificationByIdDb } = require("../db/notification_error.db");
 
 class NotifikasiWaService {
+
   async onNotification(topic, message) {
+
     try {
       const paramDb = {
         limit: 100,
         page: 1,
-        criteria: "",
+        criteria: '',
-        active: 1,
+        active: 1
-      };
+      }
 
       // const chanel = {
       //   "time": "2025-12-11 11:10:58",
@@ -29,99 +22,84 @@ class NotifikasiWaService {
       //   "c_6501": 0
       // }
 
-      if (topic === process.env.TOPIC_COD ?? "morek") {
+      if (topic === 'morek') {
+
         const dataMqtt = JSON.parse(message);
 
         const resultChanel = [];
 
         Object.entries(dataMqtt).forEach(([key, value]) => {
-          if (key.startsWith("c_")) {
+          if (key.startsWith('c_')) {
             resultChanel.push({
               chanel_id: Number(key.slice(2)),
-              value,
+              value
             });
           }
         });
 
         const results = await getAllContactDb(paramDb);
 
+        const bodyMessage = `Hai Operator\n` +
+          `Terjadi peringatan pada device, silahkan cek detail pada link berikut :\n`;
+
         const dataUsers = results.data;
 
         for (const chanel of resultChanel) {
-          const errorCode = await getErrorCodeByIdDb(chanel.value);
-          const deviceNotification = await getDeviceNotificationByIdDb(
-            chanel.chanel_id
-          );
-
           const data = {
-            error_code_id: chanel.value,
+            "error_code_id": chanel.value,
-            error_chanel: chanel.chanel_id,
+            "error_chanel": chanel.chanel_id,
-            is_send: false,
+            "message_error_issue": bodyMessage,
-            is_delivered: false,
+            "is_send": false,
-            is_read: false,
+            "is_delivered": false,
-            is_active: true,
+            "is_read": false,
-          };
+            "is_active": true
+          }
 
-          const resultNotificationError = await InsertNotificationErrorDb(data);
+          const resultNotificationError = await InsertNotificationErrorDb(data)
 
           for (const dataUser of dataUsers) {
             if (dataUser.is_active) {
-              const tokenRedirect = await generateTokenRedirect(
-                dataUser.contact_phone,
-                dataUser.contact_name,
-                resultNotificationError.notification_error_id
-              );
-
-              const encodedToken = encodeURIComponent(tokenRedirect);
-
-              const shortUrl = await shortUrltiny(encodedToken);
-
-              const bodyMessage =
-                `Hai ${dataUser.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 param = {
                 idData: resultNotificationError.notification_error_id,
                 userPhone: dataUser.contact_phone,
                 userName: dataUser.contact_name,
                 bodyMessage: bodyMessage,
-              };
+              }
 
-              const resultNotificationErrorUser =
+              const tokenRedirect = await generateTokenRedirect(param.userPhone, param.userName, param.idData)
-                await createNotificationErrorUserDb({
-                  notification_error_id:
-                    resultNotificationError.notification_error_id,
-                  contact_phone: param.userPhone,
-                  contact_name: param.userName,
-                  is_send: false,
-                });
 
-              const resultSend = await sendNotifikasi(
+              const encodedToken = encodeURIComponent(tokenRedirect);
-                param.userPhone,
-                param.bodyMessage
-              );
 
-              console.log("resultSend: ", resultSend);
+              const shortUrl = await shortUrltiny(encodedToken)
 
-              await updateNotificationErrorUserDb(
+              let bodyWithUrl = `${param.bodyMessage}\n🔗 ${shortUrl}`;
-                resultNotificationErrorUser[0].notification_error_user_id,
+
-                {
+              param.bodyMessage = bodyWithUrl
-                  is_send: resultSend?.error ? false : true,
+
-                }
+              const resultNotificationErrorUser = await createNotificationErrorUserDb({
-              );
+                notification_error_id: resultNotificationError.notification_error_id,
+                contact_phone: param.userPhone,
+                contact_name: param.userName,
+                is_send: false,
+              });
+
+              const resultSend = await sendNotifikasi(param.userPhone, param.bodyMessage);
+
+              await updateNotificationErrorUserDb(resultNotificationErrorUser[0].notification_error_user_id, {
+                is_send: resultSend?.error ? false : true,
+              });
             }
           }
         }
       }
+
     } catch (error) {
       // throw new ErrorHandler(error.statusCode, error.message);
-      return error;
+      return error
     }
   }
+
 }
 
 module.exports = new NotifikasiWaService();

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

validate/notification.schema.js

@@ -40,11 +40,21 @@ const insertNotificationSchema = Joi.object({
 // Update Notification Schema
 // ========================
 const updateNotificationSchema = Joi.object({
+  is_send: Joi.boolean().optional().messages({
+    "boolean.base": "is_send must be a boolean",
+  }),
+
+  is_delivered: Joi.boolean().optional().messages({
+    "boolean.base": "is_delivered must be a boolean",
+  }),
 
   is_read: Joi.boolean().optional().messages({
     "boolean.base": "is_read must be a boolean",
   }),
 
+  is_active: Joi.boolean().optional().messages({
+    "boolean.base": "is_active must be a boolean",
+  }),
 });
 
 module.exports = {