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

Reviewed-on: #42
This commit is contained in:
2026-01-20 04:33:05 +00:00
5 changed files with 26 additions and 28 deletions

View File

@@ -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);
@@ -209,7 +209,7 @@ class NotificationService {
const sendPromises = activeUsers.map(async (user) => {
try {
console.log(`user: ${user.contact_name} (${user.contact_phone})`);
console.log(`user: ${user.contact_name} (${user.contact_phone})`);
const tokenRedirect = await generateTokenRedirect(
user.contact_phone,
user.contact_name,
@@ -222,17 +222,17 @@ 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,
bodyWithUrl
);
console.log("notifikasi wa:", resultSend)
const isSuccess = resultSend.success;
@@ -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}`
);
}