Merge pull request 'connect mqtt ws colo' (#38) from wisdom into main

Reviewed-on: #38

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

db/notification_error_log.db.js

@@ -32,11 +32,15 @@ const getNotificationErrorLogByIdDb = async (id) => {
 const getNotificationErrorLogByNotificationErrorIdDb = async (notificationErrorId) => {
   const queryText = `
     SELECT
-      a.*,
-      b.contact_name,
-      b.contact_type
+      a.notification_error_log_description,
+      a.created_at,
+      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
   `;

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,6 +15,8 @@ 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");
 
@@ -27,6 +33,14 @@ 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,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/notifikasi-wa.service.js

@@ -69,7 +69,7 @@ class NotifikasiWaService {
               const tokenRedirect = await generateTokenRedirect(
                 dataUser.userPhone,
                 dataUser.userName,
-                dataUser.idData
+                resultNotificationError.notification_error_id
               );
 
               const encodedToken = encodeURIComponent(tokenRedirect);

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)
-    .required()
-    .messages({
-      "array.min": "Error code must have at least 1 solution",
-    }),
+    .optional(),
+  // .min(1)
+  // .required()
+  // .messages({
+  //   "array.min": "Error code must have at least 1 solution",
+  // }),
   spareparts: Joi.array()
     .items(Joi.number().integer())
     .optional(),