Compare commits
8 Commits
63bf57bde3
...
wisdom
| Author | SHA1 | Date | |
|---|---|---|---|
| 0ce6a04f97 | |||
| 76ac604ba8 | |||
| f4b400fe02 | |||
| d53f0cba33 | |||
| a20d36c012 | |||
| 88ce628204 | |||
| 7122818181 | |||
| 890a88447e |
@@ -21,7 +21,8 @@ const getNotificationByIdDb = async (id) => {
|
|||||||
d.device_name,
|
d.device_name,
|
||||||
d.device_location,
|
d.device_location,
|
||||||
d.listen_channel,
|
d.listen_channel,
|
||||||
e.brand_name
|
e.brand_name,
|
||||||
|
e.brand_id
|
||||||
|
|
||||||
FROM notification_error a
|
FROM notification_error a
|
||||||
|
|
||||||
@@ -131,17 +132,17 @@ const getAllNotificationDb = async (searchParams = {}) => {
|
|||||||
|
|
||||||
FROM notification_error a
|
FROM notification_error a
|
||||||
|
|
||||||
|
LEFT JOIN m_device d
|
||||||
|
ON a.error_chanel = d.listen_channel AND d.deleted_at IS NULL
|
||||||
|
|
||||||
LEFT JOIN brand_code b
|
LEFT JOIN brand_code b
|
||||||
ON a.error_code_id = b.error_code_id AND b.deleted_at IS NULL
|
ON a.error_code_id = b.error_code AND b.deleted_at IS NULL AND d.brand_id = b.brand_id
|
||||||
|
|
||||||
LEFT JOIN brand_code_solution c
|
LEFT JOIN brand_code_solution c
|
||||||
ON b.error_code_id = c.error_code_id AND c.deleted_at IS NULL
|
ON b.error_code_id = c.error_code_id AND c.deleted_at IS NULL
|
||||||
|
|
||||||
LEFT JOIN m_device d
|
|
||||||
ON a.error_chanel = d.listen_channel AND d.deleted_at IS NULL
|
|
||||||
|
|
||||||
LEFT JOIN m_brands e
|
LEFT JOIN m_brands e
|
||||||
ON d.brand_id = e.brand_id AND d.deleted_at IS NULL
|
ON d.brand_id = e.brand_id AND e.deleted_at IS NULL
|
||||||
|
|
||||||
WHERE a.deleted_at IS NULL
|
WHERE a.deleted_at IS NULL
|
||||||
${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}
|
${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}
|
||||||
|
|||||||
@@ -67,7 +67,9 @@ const getNotificationErrorUserByIdDb = async (id) => {
|
|||||||
d.error_code,
|
d.error_code,
|
||||||
d.error_code_name,
|
d.error_code_name,
|
||||||
|
|
||||||
e.device_name
|
e.device_name,
|
||||||
|
|
||||||
|
c.error_chanel as chanel_id
|
||||||
|
|
||||||
FROM notification_error_user a
|
FROM notification_error_user a
|
||||||
|
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
"nodemailer": "^6.8.0",
|
"nodemailer": "^6.8.0",
|
||||||
"pg": "^8.8.0",
|
"pg": "^8.8.0",
|
||||||
"pino": "^6.11.3",
|
"pino": "^6.11.3",
|
||||||
|
"pm2": "^6.0.14",
|
||||||
"stripe": "^8.138.0",
|
"stripe": "^8.138.0",
|
||||||
"svg-captcha": "^1.4.0",
|
"svg-captcha": "^1.4.0",
|
||||||
"swagger-ui-express": "^4.6.0",
|
"swagger-ui-express": "^4.6.0",
|
||||||
|
|||||||
@@ -19,7 +19,8 @@ const notificationErrorSparepart = require("./notification_error_sparepart.route
|
|||||||
const sparepart = require("./sparepart.route")
|
const sparepart = require("./sparepart.route")
|
||||||
const notificationErrorLog = require("./notification_error_log.route")
|
const notificationErrorLog = require("./notification_error_log.route")
|
||||||
const notificationErrorUser = require("./notification_error_user.route")
|
const notificationErrorUser = require("./notification_error_user.route")
|
||||||
const errorCode = require("./error_code.route")
|
const errorCode = require("./error_code.route");
|
||||||
|
const notifikasiWA = require("./notifikasi-wa.route");
|
||||||
|
|
||||||
router.use("/auth", auth);
|
router.use("/auth", auth);
|
||||||
router.use("/user", users);
|
router.use("/user", users);
|
||||||
@@ -42,5 +43,6 @@ router.use("/sparepart", sparepart)
|
|||||||
router.use("/notification-log", notificationErrorLog)
|
router.use("/notification-log", notificationErrorLog)
|
||||||
router.use("/notification-user", notificationErrorUser)
|
router.use("/notification-user", notificationErrorUser)
|
||||||
router.use("/error-code", errorCode)
|
router.use("/error-code", errorCode)
|
||||||
|
router.use("/notifikasi-wa", notifikasiWA)
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
|||||||
14
routes/notifikasi-wa.route.js
Normal file
14
routes/notifikasi-wa.route.js
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
const express = require('express');
|
||||||
|
const router = express.Router();
|
||||||
|
const NotifikasiWaService = require('../services/notifikasi-wa.service');
|
||||||
|
|
||||||
|
router.post('/restart-wa', async (req, res) => {
|
||||||
|
try {
|
||||||
|
const result = await NotifikasiWaService.restartWhatsapp();
|
||||||
|
return res.status(200).json(result);
|
||||||
|
} catch (error) {
|
||||||
|
return res.status(500).json(error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
@@ -7,7 +7,7 @@ const {
|
|||||||
updateNotificationErrorDb,
|
updateNotificationErrorDb,
|
||||||
} = require("../db/notification_error.db");
|
} = 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");
|
const { getSolutionsByErrorCodeIdDb } = require("../db/brand_code_solution.db");
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ class NotificationService {
|
|||||||
const deviceNotification = await getNotificationByIdDb(id);
|
const deviceNotification = await getNotificationByIdDb(id);
|
||||||
if (!deviceNotification) throw new ErrorHandler(404, "Data not found");
|
if (!deviceNotification) throw new ErrorHandler(404, "Data not found");
|
||||||
|
|
||||||
const errorCode = await getErrorCodeByIdDb(
|
const errorCode = await getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0,
|
||||||
deviceNotification.error_code_id
|
deviceNotification.error_code_id
|
||||||
);
|
);
|
||||||
const dataExist = await getUsersNotificationErrorDb(id);
|
const dataExist = await getUsersNotificationErrorDb(id);
|
||||||
@@ -221,11 +221,11 @@ class NotificationService {
|
|||||||
console.log("URL:", shortUrl);
|
console.log("URL:", shortUrl);
|
||||||
|
|
||||||
const bodyWithUrl =
|
const bodyWithUrl =
|
||||||
`Hai ${user.contact_name || "-"}\n` +
|
`Hai ${user.contact_name || "-"},\n` +
|
||||||
`Terjadi peringatan dengan kode ${errorCode?.error_code || "-"} - ${
|
`Terjadi peringatan dengan kode ${errorCode?.error_code ?? "-"} "${errorCode?.error_code_name}", Chanel ${deviceNotification?.error_chanel ?? "-"} ` +
|
||||||
errorCode?.error_code_name
|
`pada device ${deviceNotification.device_name ?? "berikut"}` +
|
||||||
} pada device ${deviceNotification.device_name || "-"}.\n` +
|
`\nSilahkan cek detail pada link :` +
|
||||||
`Silahkan cek detail pada link berikut:\n ${shortUrl}`;
|
`${shortUrl}`;
|
||||||
|
|
||||||
const resultSend = await sendNotifikasi(
|
const resultSend = await sendNotifikasi(
|
||||||
user.contact_phone,
|
user.contact_phone,
|
||||||
@@ -234,7 +234,7 @@ class NotificationService {
|
|||||||
|
|
||||||
console.log("notifikasi wa:", resultSend)
|
console.log("notifikasi wa:", resultSend)
|
||||||
|
|
||||||
const isSuccess = resultSend?.success ? true : false;
|
const isSuccess = resultSend.success;
|
||||||
|
|
||||||
await updateNotificationErrorDb(user.notification_error_id, {
|
await updateNotificationErrorDb(user.notification_error_id, {
|
||||||
is_send: isSuccess,
|
is_send: isSuccess,
|
||||||
@@ -256,8 +256,7 @@ class NotificationService {
|
|||||||
console.log("result akhir: ", results)
|
console.log("result akhir: ", results)
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
`Resend chat: ${
|
`Resend chat: ${results.filter((r) => r.status === "success").length
|
||||||
results.filter((r) => r.status === "success").length
|
|
||||||
}, Gagal: ${results.filter((r) => r.status === "failed").length}`
|
}, Gagal: ${results.filter((r) => r.status === "failed").length}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ class NotificationErrorUserService {
|
|||||||
try {
|
try {
|
||||||
const results = await getAllNotificationErrorUserDb(param);
|
const results = await getAllNotificationErrorUserDb(param);
|
||||||
|
|
||||||
results.data.map((element) => {});
|
results.data.map((element) => { });
|
||||||
|
|
||||||
return results;
|
return results;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -139,20 +139,17 @@ class NotificationErrorUserService {
|
|||||||
const shortUrl = await shortUrltiny(encodedToken);
|
const shortUrl = await shortUrltiny(encodedToken);
|
||||||
|
|
||||||
const bodyWithUrl =
|
const bodyWithUrl =
|
||||||
`Hai ${data.contact_name || "-"}\n` +
|
`Hai ${data.contact_name || "-"},\n` +
|
||||||
`Terjadi peringatan dengan kode error ${data.error_code || "-"} - ${
|
`Terjadi peringatan dengan kode ${data?.error_code ?? "-"} "${data?.error_code_name ?? ""}", Chanel ${data?.chanel_id ?? "-"} ` +
|
||||||
data.error_code_name || "-"
|
`pada device ${data?.device_name ?? "berikut"},` +
|
||||||
} ` +
|
`\nSilahkan cek detail pada link :` +
|
||||||
`pada device ${
|
|
||||||
data.device_name || "-"
|
|
||||||
}, silahkan cek detail pada link berikut:\n` +
|
|
||||||
`${shortUrl}`;
|
`${shortUrl}`;
|
||||||
|
|
||||||
const resultSend = await sendNotifikasi(
|
const resultSend = await sendNotifikasi(
|
||||||
data.contact_phone,
|
data.contact_phone,
|
||||||
bodyWithUrl
|
bodyWithUrl
|
||||||
);
|
);
|
||||||
const isSuccess = resultSend?.success ? true : false;
|
const isSuccess = resultSend.success;
|
||||||
|
|
||||||
const updateData = {
|
const updateData = {
|
||||||
is_send: isSuccess,
|
is_send: isSuccess,
|
||||||
@@ -165,8 +162,7 @@ class NotificationErrorUserService {
|
|||||||
results.push({
|
results.push({
|
||||||
id,
|
id,
|
||||||
status: "failed",
|
status: "failed",
|
||||||
message: `WhatsApp API Gagal: ${
|
message: `WhatsApp API Gagal: ${resultSend?.message || "Unknown Error"
|
||||||
resultSend?.message || "Unknown Error"
|
|
||||||
}`,
|
}`,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
const { getAllContactDb } = require("../db/contact.db");
|
const { getAllContactDb } = require("../db/contact.db");
|
||||||
const { InsertNotificationErrorDb } = require("../db/notification_error.db");
|
const {
|
||||||
|
InsertNotificationErrorDb,
|
||||||
|
updateNotificationErrorDb,
|
||||||
|
} = require("../db/notification_error.db");
|
||||||
const {
|
const {
|
||||||
createNotificationErrorUserDb,
|
createNotificationErrorUserDb,
|
||||||
updateNotificationErrorUserDb,
|
updateNotificationErrorUserDb,
|
||||||
@@ -12,6 +15,12 @@ const {
|
|||||||
const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
|
const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
|
||||||
const { getDeviceNotificationByIdDb } = require("../db/notification_error.db");
|
const { getDeviceNotificationByIdDb } = require("../db/notification_error.db");
|
||||||
|
|
||||||
|
const { exec } = require("child_process");
|
||||||
|
const util = require("util");
|
||||||
|
const execPromise = util.promisify(exec);
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
class NotifikasiWaService {
|
class NotifikasiWaService {
|
||||||
async onNotification(topic, message) {
|
async onNotification(topic, message) {
|
||||||
try {
|
try {
|
||||||
@@ -52,7 +61,10 @@ class NotifikasiWaService {
|
|||||||
Number(chanel.chanel_id)
|
Number(chanel.chanel_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
const errorCode = await getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0, chanel.value);
|
const errorCode = await getErrorCodeByBrandAndCodeDb(
|
||||||
|
deviceNotification?.brand_id ?? 0,
|
||||||
|
chanel.value
|
||||||
|
);
|
||||||
|
|
||||||
const data = {
|
const data = {
|
||||||
error_code_id: chanel.value,
|
error_code_id: chanel.value,
|
||||||
@@ -65,6 +77,8 @@ class NotifikasiWaService {
|
|||||||
|
|
||||||
const resultNotificationError = await InsertNotificationErrorDb(data);
|
const resultNotificationError = await InsertNotificationErrorDb(data);
|
||||||
|
|
||||||
|
let isSendNotification = false;
|
||||||
|
|
||||||
for (const dataUser of dataUsers) {
|
for (const dataUser of dataUsers) {
|
||||||
if (dataUser.is_active) {
|
if (dataUser.is_active) {
|
||||||
const tokenRedirect = await generateTokenRedirect(
|
const tokenRedirect = await generateTokenRedirect(
|
||||||
@@ -78,10 +92,12 @@ class NotifikasiWaService {
|
|||||||
const shortUrl = await shortUrltiny(encodedToken);
|
const shortUrl = await shortUrltiny(encodedToken);
|
||||||
|
|
||||||
const bodyMessage =
|
const bodyMessage =
|
||||||
`Hai ${dataUser.contact_name || "-"}\n` +
|
`Hai ${dataUser.contact_name || "-"},\n` +
|
||||||
`Terjadi kode error ${chanel?.value ?? "-"} ${errorCode?.error_code_name ?? ""} Chanel ${chanel?.chanel_id ?? "-"} ` +
|
`Terjadi peringatan dengan kode ${chanel?.value ?? "-"} "${
|
||||||
`pada device ${deviceNotification?.device_name ?? "berikut"
|
errorCode?.error_code_name ?? ""
|
||||||
}, Silahkan cek detail pada link berikut:\n` +
|
}", Chanel ${chanel?.chanel_id ?? "-"} ` +
|
||||||
|
`pada device ${deviceNotification?.device_name ?? "berikut"},` +
|
||||||
|
`\nSilahkan cek detail pada link :` +
|
||||||
`${shortUrl}`;
|
`${shortUrl}`;
|
||||||
|
|
||||||
const param = {
|
const param = {
|
||||||
@@ -94,6 +110,7 @@ class NotifikasiWaService {
|
|||||||
const resultNotificationErrorUser =
|
const resultNotificationErrorUser =
|
||||||
await createNotificationErrorUserDb({
|
await createNotificationErrorUserDb({
|
||||||
notification_error_id: param.idData,
|
notification_error_id: param.idData,
|
||||||
|
|
||||||
contact_phone: param.userPhone,
|
contact_phone: param.userPhone,
|
||||||
contact_name: param.userName,
|
contact_name: param.userName,
|
||||||
message_error_issue: param.bodyMessage,
|
message_error_issue: param.bodyMessage,
|
||||||
@@ -108,16 +125,72 @@ class NotifikasiWaService {
|
|||||||
await updateNotificationErrorUserDb(
|
await updateNotificationErrorUserDb(
|
||||||
resultNotificationErrorUser[0].notification_error_user_id,
|
resultNotificationErrorUser[0].notification_error_user_id,
|
||||||
{
|
{
|
||||||
is_send: resultSend?.success ? true : false,
|
is_send: resultSend.success,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (resultSend.success) {
|
||||||
|
isSendNotification = resultSend.success;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await updateNotificationErrorDb(
|
||||||
|
resultNotificationError.notification_error_id,
|
||||||
|
{
|
||||||
|
is_send: isSendNotification,
|
||||||
|
is_delivered: isSendNotification,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} catch (err) {
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
|
||||||
// throw new ErrorHandler(error.statusCode, error.message);
|
async restartWhatsapp() {
|
||||||
return error;
|
try {
|
||||||
|
const processName = "Whatsapp-API-notification" && "cod-whatsapp-notif";
|
||||||
|
const { stdout } = await execPromise("pm2 jlist");
|
||||||
|
const processes = JSON.parse(stdout);
|
||||||
|
const waProcess = processes.find((p) => p.name === processName);
|
||||||
|
|
||||||
|
if (!waProcess) throw new Error(`PM2 ${processName} not found`);
|
||||||
|
|
||||||
|
const waProcessId = waProcess.pm_id;
|
||||||
|
const pathDelete = waProcess.pm2_env.pm_cwd;
|
||||||
|
|
||||||
|
// const execLogs = (cmd) => {
|
||||||
|
// const p = exec(cmd);
|
||||||
|
// p.stdout.pipe(process.stdout);
|
||||||
|
// p.stderr.pipe(process.stderr);
|
||||||
|
// return new Promise((res) => p.on("exit", res));
|
||||||
|
// };
|
||||||
|
|
||||||
|
// console.log(`stop proses id: ${waProcessId}`)
|
||||||
|
await execPromise(`start powershell -Command "pm2 stop ${waProcessId}"`);
|
||||||
|
|
||||||
|
const pathFolderDelete = [
|
||||||
|
path.join(pathDelete, ".wwebjs_auth"),
|
||||||
|
path.join(pathDelete, ".wwebjs_cache"),
|
||||||
|
];
|
||||||
|
|
||||||
|
// console.log(`path: ${pathDelete}`);
|
||||||
|
|
||||||
|
pathFolderDelete.forEach((dir) => {
|
||||||
|
if (fs.existsSync(dir)) {
|
||||||
|
// console.log(`path folder: ${dir}`);
|
||||||
|
fs.rmSync(dir, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// console.log(`start proses id: ${waProcessId}`);
|
||||||
|
await execPromise(`start powershell -Command "pm2 start ${waProcessId}"`);
|
||||||
|
|
||||||
|
return { success: true, message: "WhatsApp has been restarted." };
|
||||||
|
} catch (err) {
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user