Merge pull request 'fixing body message notification wa' (#42) from wisdom into main

Reviewed-on: #42

db/notification_error.db.js

@@ -21,7 +21,8 @@ const getNotificationByIdDb = async (id) => {
       d.device_name,
       d.device_location,
       d.listen_channel,
-      e.brand_name
+      e.brand_name,
+      e.brand_id
 
     FROM notification_error a
 

db/notification_error_user.db.js

@@ -67,7 +67,9 @@ const getNotificationErrorUserByIdDb = async (id) => {
       d.error_code,
       d.error_code_name,
 
-      e.device_name
+      e.device_name,
+
+      c.error_chanel as chanel_id
       
     FROM notification_error_user a
     

services/notification_error.service.js

@@ -7,7 +7,7 @@ const {
   updateNotificationErrorDb,
 } = require("../db/notification_error.db");
 
-const { getErrorCodeByIdDb } = require("../db/brand_code.db");
+const { getErrorCodeByIdDb, getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
 
 const { getSolutionsByErrorCodeIdDb } = require("../db/brand_code_solution.db");
 
@@ -176,7 +176,7 @@ class NotificationService {
     if (!deviceNotification)
       throw new ErrorHandler(404, "Notification Data not found");
 
-    const errorCode = await getErrorCodeByIdDb(
+    const errorCode = await getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0,
       deviceNotification.error_code_id
     );
     const dataExist = await getUsersNotificationErrorDb(id);
@@ -222,11 +222,11 @@ class NotificationService {
         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}`;
+          `Hai ${user.contact_name || "-"},\n` +
+          `Terjadi peringatan dengan kode ${errorCode?.error_code ?? "-"} "${errorCode?.error_code_name}", Chanel ${deviceNotification?.error_chanel ?? "-"} ` +
+          `pada device ${deviceNotification.device_name ?? "berikut"}` +
+          `\nSilahkan cek detail pada link :` +
+          `${shortUrl}`;
 
         const resultSend = await sendNotifikasi(
           user.contact_phone,
@@ -257,8 +257,7 @@ class NotificationService {
     console.log("result akhir: ", results)
 
     console.log(
-      `Resend chat: ${
-        results.filter((r) => r.status === "success").length
+      `Resend chat: ${results.filter((r) => r.status === "success").length
       }, Gagal: ${results.filter((r) => r.status === "failed").length}`
     );
   }

services/notification_error_user.service.js

@@ -139,13 +139,10 @@ class NotificationErrorUserService {
         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` +
+          `Hai ${data.contact_name || "-"},\n` +
+          `Terjadi peringatan dengan kode ${data?.error_code ?? "-"} "${data?.error_code_name ?? ""}", Chanel ${data?.chanel_id ?? "-"} ` +
+          `pada device ${data?.device_name ?? "berikut"},` +
+          `\nSilahkan cek detail pada link :` +
           `${shortUrl}`;
 
         const resultSend = await sendNotifikasi(
@@ -165,8 +162,7 @@ class NotificationErrorUserService {
           results.push({
             id,
             status: "failed",
-            message: `WhatsApp API Gagal: ${
-              resultSend?.message || "Unknown Error"
+            message: `WhatsApp API Gagal: ${resultSend?.message || "Unknown Error"
               }`,
           });
         } else {

services/notifikasi-wa.service.js

@@ -80,10 +80,10 @@ class NotifikasiWaService {
               const shortUrl = await shortUrltiny(encodedToken);
 
               const bodyMessage =
-                `Hai ${dataUser.contact_name || "-"}\n` +
-                `Terjadi kode error ${chanel?.value ?? "-"} ${errorCode?.error_code_name ?? ""}Chanel ${chanel?.chanel_id ?? "-"} ` +
-                `pada device ${deviceNotification?.device_name ?? "berikut"
-                }, Silahkan cek detail pada link berikut:\n` +
+                `Hai ${dataUser.contact_name || "-"},\n` +
+                `Terjadi peringatan dengan kode ${chanel?.value ?? "-"} "${errorCode?.error_code_name ?? ""}", Chanel ${chanel?.chanel_id ?? "-"} ` +
+                `pada device ${deviceNotification?.device_name ?? "berikut"},` +
+                `\nSilahkan cek detail pada link :` +
                 `${shortUrl}`;
 
               const param = {