Merge pull request 'wisdom' (#64) from wisdom into main

Reviewed-on: #64

db/device.db.js

@@ -149,12 +149,23 @@ const getDeviceReminderMonthlyDb = async (id) => {
     COALESCE(a.device_code, '') + ' - ' + COALESCE(a.device_name, '') AS device_code_name
     FROM m_device a
     LEFT JOIN m_brands b ON a.brand_id = b.brand_id
-    WHERE a.device_id = $1 AND a.deleted_at IS NULL AND a.reminder_at_monthly IS NOT NULL
+    WHERE a.device_id = $1 AND a.deleted_at IS NULL
   `;
   const result = await pool.query(queryText, [id]);
   return result.recordset;
 };
 
+const updateDeviceReminderMonthlyDb = async (deviceId, reminderMonthly) => {
+  const queryText = `
+    UPDATE m_device
+    SET reminder_at_monthly = $1,
+        updated_at = CURRENT_TIMESTAMP
+    WHERE device_id = $2 AND deleted_at IS NULL
+  `;
+  await pool.query(queryText, [reminderMonthly, deviceId]);
+  return getDeviceByIdDb(deviceId);
+};
+
 const getDeviceReminderCustomDb = async (id) => {
   const queryText = `
     SELECT 
@@ -193,4 +204,5 @@ module.exports = {
   getDeviceReminderMonthlyDb,
   getDeviceReminderCustomDb,
   updateDeviceReminderCustomDb,
+  updateDeviceReminderMonthlyDb
 };

routes/notifikasi-wa.route.js

@@ -1,5 +1,8 @@
 const express = require('express');
 const router = express.Router();
+
+const verifyToken = require("../middleware/verifyToken");
+const verifyAccess = require("../middleware/verifyAccess");
 const NotifikasiWaService = require('../services/notifikasi-wa.service');
 
 router.post('/restart-wa', async (req, res) => {
@@ -11,20 +14,21 @@ router.post('/restart-wa', async (req, res) => {
   }
 });
 
-router.post('/reminder-sparepart/:id', async (req, res) => {
+router.post('/reminder-monthly/:id', verifyToken.verifyAccessToken, verifyAccess(), async (req, res) => {
   try {
     const { id } = req.params;
-    const result = await NotifikasiWaService.onMonthlyReminder(id);
+    const { reminder_at_monthly } = req.body;
+    const result = await NotifikasiWaService.onMonthlyReminder(id, reminder_at_monthly);
     return res.status(200).json(result);
   } catch (error) {
     return res.status(500).json(error);
   }
 });
 
-router.post('/reminder-custom/:id', async (req, res) => {
+router.post('/reminder-custom/:id', verifyToken.verifyAccessToken, verifyAccess(), async (req, res) => {
   try {
     const { id } = req.params;
-    const {start_date, end_date} = req.body;
+    const { start_date, end_date } = req.body;
     const result = await NotifikasiWaService.onCustomReminder(id, start_date, end_date);
     return res.status(200).json(result);
   } catch (error) {
@@ -32,52 +36,51 @@ router.post('/reminder-custom/:id', async (req, res) => {
   }
 });
 
-router.get('/cron/jobs', async (req, res) => {
-  try {
-    const activeJobs = NotifikasiWaService.getActiveCronJobs();
-    return res.status(200).json({
-      success: true,
-      total: activeJobs.length,
-      jobs: activeJobs
-    });
-  } catch (error) {
-    return res.status(500).json({ 
-      success: false, 
-      message: error.message 
-    });
-  }
-});
+// router.get('/cron/jobs', async (req, res) => {
+//   try {
+//     const activeJobs = NotifikasiWaService.getActiveCronJobs();
+//     return res.status(200).json({
+//       success: true,
+//       total: activeJobs.length,
+//       jobs: activeJobs
+//     });
+//   } catch (error) {
+//     return res.status(500).json({ 
+//       success: false, 
+//       message: error.message 
+//     });
+//   }
+// });
 
-router.delete('/cron/jobs/:deviceId', async (req, res) => {
-  try {
-    const { deviceId } = req.params;
-    NotifikasiWaService.stopCronJob(deviceId);
-    return res.status(200).json({
-      success: true,
-      message: `Cron job untuk device ${deviceId} dihentikan`
-    });
-  } catch (error) {
-    return res.status(500).json({ 
-      success: false, 
-      message: error.message 
-    });
-  }
-});
+// router.delete('/cron/jobs/:deviceId', async (req, res) => {
+//   try {
+//     const { deviceId } = req.params;
+//     NotifikasiWaService.stopCronJob(deviceId);
+//     return res.status(200).json({
+//       success: true,
+//       message: `Cron job untuk device ${deviceId} dihentikan`
+//     });
+//   } catch (error) {
+//     return res.status(500).json({ 
+//       success: false, 
+//       message: error.message 
+//     });
+//   }
+// });
 
-// Endpoint untuk menghentikan semua cron job
-router.delete('/cron/jobs', async (req, res) => {
-  try {
-    NotifikasiWaService.stopAllCronJobs();
-    return res.status(200).json({
-      success: true,
-      message: 'Semua cron job dihentikan'
-    });
-  } catch (error) {
-    return res.status(500).json({ 
-      success: false, 
-      message: error.message 
-    });
-  }
-});
+// router.delete('/cron/jobs', async (req, res) => {
+//   try {
+//     NotifikasiWaService.stopAllCronJobs();
+//     return res.status(200).json({
+//       success: true,
+//       message: 'Semua cron job dihentikan'
+//     });
+//   } catch (error) {
+//     return res.status(500).json({ 
+//       success: false, 
+//       message: error.message 
+//     });
+//   }
+// });
 
 module.exports = router;

scheduler/reminder.json

@@ -1 +0,0 @@
-[]

services/notifikasi-wa.service.js

@@ -24,17 +24,25 @@ const {
 
 const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
 
+const {
+  getDeviceReminderChanelDb,
+  getDeviceReminderMonthlyDb,
+  getDeviceReminderCustomDb,
+  updateDeviceReminderCustomDb,
+  updateDeviceReminderMonthlyDb
+} = require("../db/device.db");
+
+const {
+  getSparepartsByMonthlyDb,
+  getSparepartsByCustomDb
+} = require("../db/sparepart.db");
+
 const { exec } = require("child_process");
 const util = require("util");
 const execPromise = util.promisify(exec);
 const fs = require('fs').promises;
 const path = require("path");
-const { getDeviceReminderChanelDb,
-  getDeviceReminderMonthlyDb,
-  getDeviceReminderCustomDb,
-  updateDeviceReminderCustomDb
-} = require("../db/device.db");
-const { getSparepartsByMonthlyDb, getSparepartsByCustomDb } = require("../db/sparepart.db");
+
 const baseDir = path.resolve(__dirname, '../scheduler');
 const filePath = path.join(baseDir, 'reminder.json');
 // const filePathLog = path.join(baseDir, 'log.json');
@@ -605,8 +613,10 @@ class NotifikasiWaService {
     }
   }
 
-  async onMonthlyReminder(deviceId) {
+
+  async onMonthlyReminder(deviceId, reminderMonthly) {
     try {
+
       const paramDb = {
         limit: 100,
         page: 1,
@@ -614,53 +624,201 @@ class NotifikasiWaService {
         active: true,
       };
 
-      const allDeviceReminders = await getDeviceReminderMonthlyDb(deviceId);
+      const devices = await getDeviceReminderMonthlyDb(deviceId);
 
-      if (!allDeviceReminders || allDeviceReminders.length === 0) {
-        return { success: false, message: 'Tidak ada data device.' };
+      if (!devices || devices.length === 0) {
+        return {
+          success: false,
+          message: `Device dengan ID ${deviceId} tidak ditemukan di database`
+        };
       }
 
-      const now = dayjs().tz(timeZone);
-      const currentYear = dayjs().tz(timeZone).year();
-      const currentMonth = dayjs().tz(timeZone).month() + 1;
+      const device = devices[0];
+      const deviceName = device.device_name;
+      const currentDeviceId = device.device_id;
 
-      for (const deviceReminder of allDeviceReminders) {
+      let targetReminderTime = device.reminder_at_monthly;
 
-        if (deviceReminder?.reminder_at_monthly) {
-          const deviceName = deviceReminder.device_name ?? '-';
-          const currentDeviceId = deviceReminder.device_id;
+      if (reminderMonthly) {
+        const isValidDate = dayjs.tz(reminderMonthly, this.timeZone).isValid();
+        if (!isValidDate) {
+          return {
+            success: false,
+            message: 'Format Reminder Monthly tidak valid. Gunakan format YYYY-MM-DD HH:mm:ss'
+          };
+        }
 
-          const reminderAt = dayjs.tz(
-            deviceReminder.reminder_at_monthly,
-            timeZone
+        const updatedDevice = await updateDeviceReminderMonthlyDb(deviceId, reminderMonthly);
+        if (!updatedDevice) {
+          return {
+            success: false,
+            message: 'Gagal mengupdate Reminder Monthly.'
+          };
+        }
+
+        targetReminderTime = reminderMonthly;
+
+      } else if (!targetReminderTime) {
+        const reminderTime = dayjs().tz(this.timeZone).add(1, 'hour').format('YYYY-MM-DD HH:mm:ss');
+        const updatedDevice = await updateDeviceReminderMonthlyDb(deviceId, reminderTime);
+
+        if (!updatedDevice) {
+          return {
+            success: false,
+            message: 'Gagal update Reminder Monthly dengan default time.'
+          };
+        }
+        targetReminderTime = reminderTime;
+      }
+
+      const reminderAt = dayjs.tz(targetReminderTime, this.timeZone);
+      const now = dayjs().tz(this.timeZone);
+      const isEndDatePassed = now.isAfter(reminderAt) || now.isSame(reminderAt);
+
+      if (isEndDatePassed) {
+        const sendResult = await this.sendMonthlyReminderNow(
+          currentDeviceId,
+          deviceName,
+          reminderAt
+        );
+        return sendResult;
+      }
+
+      this.stopCronJob(currentDeviceId);
+
+      const scheduleResult = await this.scheduleMonthlyReminderJob(
+        currentDeviceId,
+        deviceName,
+        reminderAt
       );
 
-          const nowKey = now.format('MM-DD HH:mm');
-          const reminderKey = reminderAt.format('MM-DD HH:mm');
+      return {
+        success: true,
+        message: `Reminder berhasil dijadwalkan untuk device ${deviceName}`,
+      };
 
-          const isTriggered = nowKey >= reminderKey;
+    } catch (err) {
+      console.error('Error on Monthly Reminder:', err);
+      throw err
+    }
+  }
 
-          if (isTriggered) {
+  async scheduleMonthlyReminderJob(deviceId, deviceName, reminderAt) {
+    try {
+      const now = dayjs().tz(this.timeZone);
+
+      const targetTime = reminderAt.clone()
+        .set('second', 0)
+        .set('millisecond', 0);
+
+      const nextRun = targetTime.format('YYYY-MM-DD HH:mm:ss');
+
+      console.log(`Reminder untuk ${deviceName} dijadwalkan pada ${nextRun}`);
+      console.log(`Reminder At: ${reminderAt.format('YYYY-MM-DD HH:mm:ss')}`);
+
+
+      const timeoutId = setTimeout(async () => {
+        console.log(`Waktu pengiriman tiba untuk ${deviceName} pada ${dayjs().tz(this.timeZone).format('YYYY-MM-DD HH:mm:ss')}`);
+        try {
+          await this.sendMonthlyReminderNow(deviceId, deviceName, reminderAt);
+        } catch (error) {
+          console.error(`Gagal mengirim reminder untuk ${deviceName}:`, error);
+        }
+      });
+
+      this.cronJobs.set(deviceId, {
+        timeoutId,
+        nextRun,
+        reminderAt: reminderAt.format('YYYY-MM-DD HH:mm:ss')
+      });
+
+      const cronExpression = `${reminderAt.minute()} ${reminderAt.hour()} * * *`;
+      console.log(`Backup cron akan berjalan setiap hari pada ${reminderAt.hour()}:${reminderAt.minute()}`);
+
+      const cronTask = cron.schedule(cronExpression, async () => {
+        console.log(`Backup cron job berjalan untuk ${deviceName} pada ${dayjs().tz(this.timeZone).format('YYYY-MM-DD HH:mm:ss')}`);
+        try {
+          const now = dayjs().tz(this.timeZone);
+          const isEndDatePassed = now.isAfter(reminderAt) || now.isSame(reminderAt);
+
+          if (isEndDatePassed) {
+            const currentMonth = now.month() + 1;
+            const checkNotifExist = await getReminderNotificationErrorByMonthlyDb(
+              parseInt(`${currentMonth}`),
+              currentMonth,
+              deviceId
+            );
+
+            if (!checkNotifExist) {
+              await this.sendMonthlyReminderNow(deviceId, deviceName, reminderAt);
+            } else {
+              console.log(`Reminder untuk ${deviceName} sudah pernah dikirim`);
+            }
+
+            cronTask.stop();
+            this.cronJobs.delete(`cron_${deviceId}`);
+          } else {
+            console.log(`Menunggu reminder untuk ${deviceName}: ${reminderAt.format('YYYY-MM-DD HH:mm:ss')}`);
+          }
+        } catch (error) {
+          console.error(`Backup cron job gagal untuk ${deviceName}:`, error);
+        }
+      }, {
+        timezone: this.timeZone
+      });
+
+      this.cronJobs.set(`cron_${deviceId}`, {
+        cronTask,
+        nextRun,
+        reminderAt: reminderAt.format('YYYY-MM-DD HH:mm:ss')
+      });
+
+      return {
+        nextRun,
+        targetDate: targetTime.format('YYYY-MM-DD HH:mm:ss'),
+        reminderAt: reminderAt.format('YYYY-MM-DD HH:mm:ss'),
+        cronExpression: cronExpression,
+      };
+
+    } catch (error) {
+      console.error('Error scheduling monthly reminder:', error);
+      throw error;
+    }
+  }
+
+  async sendMonthlyReminderNow(deviceId, deviceName, reminderAt) {
+    try {
+
+      const paramDb = {
+        limit: 100,
+        page: 1,
+        criteria: "",
+        active: true,
+      };
+
+      const now = dayjs().tz(this.timeZone);
+      const currentMonth = now.month() + 1;
+      const currentYear = now.year();
       const monthlyCode = parseInt(`${currentMonth}`);
 
       const checkNotifExist = await getReminderNotificationErrorByMonthlyDb(
         monthlyCode,
         currentMonth,
-              currentDeviceId
+        deviceId
       );
 
       if (checkNotifExist) {
-              throw new Error(`Reminder untuk device ${deviceName} device id ${currentDeviceId} bulan ${currentMonth} sudah pernah dibuat.`);
-              continue;
+        return {
+          success: false,
+          message: `Reminder untuk device ${deviceName} sudah pernah dibuat.`
+        };
       }
 
       const spareparts = await getSparepartsByMonthlyDb(currentMonth);
-
-            let sparepartList = "";
-            if (spareparts && spareparts.length > 0) {
-              sparepartList = "\n\nDaftar sparepart yang perlu diperiksa:\n" +
-                spareparts.map((sp, idx) => `${idx + 1}. ${sp.sparepart_name || 'Sparepart'}`).join('\n');
-            }
+      const sparepartList = spareparts && spareparts.length > 0
+        ? "\n\nDaftar sparepart yang perlu diperiksa:\n" +
+        spareparts.map((sp, idx) => `${idx + 1}. ${sp.sparepart_name || 'Sparepart'}`).join('\n')
+        : "";
 
       const data = {
         error_code_id: monthlyCode,
@@ -669,18 +827,26 @@ class NotifikasiWaService {
         is_delivered: 0,
         is_read: 0,
         is_active: 1,
-              message_error_issue: `reminder device ${deviceName} device_id: ${currentDeviceId} in month ${currentMonth}`,
+        message_error_issue: `reminder monthly device ${deviceName} in month ${currentMonth}`,
       };
 
       const resultNotificationError = await InsertNotificationErrorDb(data);
+      if (!resultNotificationError) {
+        return {
+          success: false,
+          message: 'Gagal menyimpan notifikasi error'
+        };
+      }
+
       const results = await getAllContactDb(paramDb);
       const dataUsers = results.data;
 
       let isSendNotification = false;
+      let successCount = 0;
+      let failCount = 0;
 
       for (const dataUser of dataUsers) {
         if (dataUser.is_active) {
-
           const tokenRedirect = await generateTokenRedirect(
             dataUser.contact_phone,
             dataUser.contact_name,
@@ -694,7 +860,7 @@ class NotifikasiWaService {
             `Hai ${dataUser.contact_name || "-"},\n\n` +
             `Diberitahukan bahwa terdapat sparepart pada device "${deviceName}" ` +
             `yang telah memasuki jadwal perawatan bulanan untuk bulan ${currentMonth} pada tahun ${currentYear}.${sparepartList}\n\n` +
-                  `Silakan segera lakukan pengecekan dan perawatan untuk memastikan kinerja tetap optimal.`;
+            `Silakan segera lakukan pengecekan dan perawatan untuk memastikan kinerja tetap optimal.`
 
           const param = {
             idData: resultNotificationError.notification_error_id,
@@ -716,15 +882,17 @@ class NotifikasiWaService {
             param.bodyMessage
           );
 
+          if (resultNotificationErrorUser && resultNotificationErrorUser.length > 0) {
             await updateNotificationErrorUserDb(
               resultNotificationErrorUser[0].notification_error_user_id,
               {
                 is_send: resultSend.success,
               }
             );
+          }
 
           if (resultSend.success) {
-                  isSendNotification = resultSend.success;
+            isSendNotification = true;
           }
         }
       }
@@ -741,7 +909,7 @@ class NotifikasiWaService {
         notification_log: resultNotificationError.notification_error_id,
         error_code_id: data['error_code_id'],
         error_chanel: data['error_chanel'],
-              start_at: reminderAt.format('HH:mm'),
+        start_at: now.format('HH:mm'),
         interval: 1,
         max: 3,
         active: 1,
@@ -750,18 +918,18 @@ class NotifikasiWaService {
         last_run_indo: now.format('DD-MM-YYYY HH:mm:ss'),
         next_run: null,
         next_run_indo: null,
-              message: `Reminder untuk ${deviceName} bulan ${currentMonth} telah dijalankan.`,
+        message: `Reminder monthly untuk ${deviceName} bulan ${currentMonth} telah dijalankan.`,
       }, false);
 
-          }
-        }
-      }
+      this.stopCronJob(deviceId);
 
-      return { success: true, message: "Reminder has been sent." };
+      return {
+        success: true,
+        message: "Reminder has been sent.",
+      };
 
-    } catch (err) {
-      console.log('Error on Monthly Reminder:', err);
-      throw err;
+    } catch (error) {
+      throw error;
     }
   }
 
@@ -777,7 +945,7 @@ class NotifikasiWaService {
       if (!inputStartDate || !inputEndDate) {
         return {
           success: false,
-          message: 'start_date dan end_date harus diisi. Format: YYYY-MM-DD HH:mm:ss'
+          message: 'Start Date dan End Date harus diisi. Format: YYYY-MM-DD HH:mm:ss'
         };
       }
 
@@ -787,14 +955,14 @@ class NotifikasiWaService {
       if (!startDateObj.isValid() || !endDateObj.isValid()) {
         return {
           success: false,
-          message: 'Format tanggal tidak valid. Gunakan format: YYYY-MM-DD HH:mm:ss'
+          message: 'Format tanggal Start Date dan End Date tidak valid. Gunakan format: YYYY-MM-DD HH:mm:ss'
         };
       }
 
       if (!endDateObj.isAfter(startDateObj)) {
         return {
           success: false,
-          message: 'end_date harus lebih besar dari start_date'
+          message: 'End Date harus lebih besar dari Start Date'
         };
       }
 
@@ -821,11 +989,9 @@ class NotifikasiWaService {
         };
       }
 
-      console.log(`Berhasil update start_date dan end_date untuk device ${deviceName}`);
-
       this.stopCronJob(currentDeviceId);
 
-      const scheduleResult = await this.scheduleReminderJob(
+      const scheduleResult = await this.scheduleCustomReminderJob(
         currentDeviceId,
         deviceName,
         startDateObj,
@@ -837,7 +1003,7 @@ class NotifikasiWaService {
 
       if (isEndDatePassed) {
         console.log(`⏰ End_date sudah terlewati, mengirim reminder sekarang untuk ${deviceName}`);
-        const sendResult = await this.sendReminderNow(
+        const sendResult = await this.sendCustomReminderNow(
           currentDeviceId,
           deviceName,
           startDateObj,
@@ -847,16 +1013,12 @@ class NotifikasiWaService {
         return {
           success: true,
           message: 'Reminder berhasil dijadwalkan dan dikirim sekarang',
-          schedule: scheduleResult,
-          sendResult: sendResult
         };
       }
 
       return {
         success: true,
         message: `Reminder berhasil dijadwalkan untuk device ${deviceName}`,
-        schedule: scheduleResult,
-        nextRun: scheduleResult.nextRun
       };
 
     } catch (err) {
@@ -865,7 +1027,7 @@ class NotifikasiWaService {
     }
   }
 
-  async scheduleReminderJob(deviceId, deviceName, startDateObj, endDateObj) {
+  async scheduleCustomReminderJob(deviceId, deviceName, startDateObj, endDateObj) {
     try {
       const now = dayjs().tz(this.timeZone);
 
@@ -875,10 +1037,6 @@ class NotifikasiWaService {
 
       const nextRun = targetTime.format('YYYY-MM-DD HH:mm:ss');
 
-      console.log(`Reminder untuk ${deviceName} dijadwalkan pada ${nextRun}`);
-      console.log(`Start Date: ${startDateObj.format('YYYY-MM-DD HH:mm:ss')}`);
-      console.log(`End Date: ${endDateObj.format('YYYY-MM-DD HH:mm:ss')}`);
-
       const timeoutId = setTimeout(async () => {
         console.log(`Waktu pengiriman tiba untuk ${deviceName} pada ${dayjs().tz(this.timeZone).format('YYYY-MM-DD HH:mm:ss')}`);
         try {
@@ -886,13 +1044,11 @@ class NotifikasiWaService {
           const isEndDatePassed = now.isAfter(endDateObj) || now.isSame(endDateObj);
 
           if (isEndDatePassed) {
-            await this.sendReminderNow(deviceId, deviceName, startDateObj, endDateObj);
-          } else {
-            console.log(`End_date untuk ${deviceName} belum terlewati, menunggu...`);
-            this.rescheduleReminderCheck(deviceId, deviceName, startDateObj, endDateObj);
+            await this.sendCustomReminderNow(deviceId, deviceName, startDateObj, endDateObj);
           }
-        } catch (error) {
-          console.error(`Gagal mengirim reminder untuk ${deviceName}:`, error);
+
+        } catch (err) {
+          throw err
         }
       });
 
@@ -907,10 +1063,8 @@ class NotifikasiWaService {
       const endMinute = endDateObj.minute();
       const cronExpression = `${endMinute} ${endHour} * * *`;
 
-      console.log(`Backup cron akan berjalan setiap hari pada ${endHour}:${endMinute}`);
 
       const cronTask = cron.schedule(cronExpression, async () => {
-        console.log(`Backup cron job berjalan untuk ${deviceName} pada ${dayjs().tz(this.timeZone).format('YYYY-MM-DD HH:mm:ss')}`);
         try {
           const now = dayjs().tz(this.timeZone);
           const isEndDatePassed = now.isAfter(endDateObj) || now.isSame(endDateObj);
@@ -924,20 +1078,23 @@ class NotifikasiWaService {
             );
 
             if (!checkNotifExist) {
-              await this.sendReminderNow(deviceId, deviceName, startDateObj, endDateObj);
+              await this.sendCustomReminderNow(deviceId, deviceName, startDateObj, endDateObj);
             } else {
-              console.log(`Reminder untuk ${deviceName} sudah pernah dikirim`);
+              return {
+                success: false,
+                message: `Reminder untuk ${deviceName} sudah pernah dikirim`
+              };
             }
 
             cronTask.stop();
             this.cronJobs.delete(deviceId);
             this.cronJobs.delete(`cron_${deviceId}`);
-          } else {
-            console.log(`Menunggu end_date untuk ${deviceName}: ${endDateObj.format('YYYY-MM-DD HH:mm:ss')}`);
           }
-        } catch (error) {
-          console.error(`Backup cron job gagal untuk ${deviceName}:`, error);
+
+        } catch (err) {
+          throw err
         }
+
       }, {
         timezone: this.timeZone
       });
@@ -962,30 +1119,15 @@ class NotifikasiWaService {
     }
   }
 
-  async rescheduleReminderCheck(deviceId, deviceName, startDateObj, endDateObj) {
-    const checkInterval = setInterval(async () => {
-      const now = dayjs().tz(this.timeZone);
-      const isEndDatePassed = now.isAfter(endDateObj) || now.isSame(endDateObj);
-
-      if (isEndDatePassed) {
-        clearInterval(checkInterval);
-        console.log(`End_date terlewati untuk ${deviceName}, mengirim reminder...`);
+  async sendCustomReminderNow(deviceId, deviceName, startDateObj, endDateObj) {
     try {
-          await this.sendReminderNow(deviceId, deviceName, startDateObj, endDateObj);
-        } catch (error) {
-          console.error(`Gagal mengirim reminder untuk ${deviceName}:`, error);
-        }
-      }
-    }, 60000);
 
-    this.cronJobs.set(`interval_${deviceId}`, {
-      intervalId: checkInterval
-    });
-  }
-
-  async sendReminderNow(deviceId, deviceName, startDateObj, endDateObj) {
-    try {
-      console.log(`Mengirim reminder untuk ${deviceName}`);
+      const paramDb = {
+        limit: 100,
+        page: 1,
+        criteria: "",
+        active: true,
+      };
 
       const now = dayjs().tz(this.timeZone);
       const currentMonth = now.month() + 1;
@@ -998,7 +1140,6 @@ class NotifikasiWaService {
       );
 
       if (checkNotifExist) {
-        console.log(`Reminder untuk ${deviceName} sudah pernah dibuat`);
         return {
           success: false,
           message: `Reminder untuk device ${deviceName} sudah pernah dibuat.`
@@ -1017,12 +1158,6 @@ class NotifikasiWaService {
 
       const resultNotificationError = await InsertNotificationErrorDb(data);
 
-      const paramDb = {
-        limit: 100,
-        page: 1,
-        criteria: "",
-        active: true,
-      };
       const results = await getAllContactDb(paramDb);
       const dataUsers = results.data;
 
@@ -1078,7 +1213,7 @@ class NotifikasiWaService {
           }
 
           if (resultSend.success) {
-            isSendNotification = resultSend.success;
+            isSendNotification = true;
           }
         }
       }
@@ -1109,12 +1244,11 @@ class NotifikasiWaService {
 
       this.stopCronJob(deviceId);
 
-      console.log(`Reminder berhasil dikirim untuk ${deviceName}`);
       return { success: true, message: "Reminder has been sent." };
 
-    } catch (error) {
-      console.error('Error sending reminder now:', error);
-      throw error;
+    } catch (err) {
+      console.error('Error sending reminder now:', err);
+      throw err;
     }
   }
 
@@ -1142,39 +1276,6 @@ class NotifikasiWaService {
     this.cronJobs.delete(`interval_${deviceId}`);
   }
 
-
-  getActiveCronJobs() {
-    const activeJobs = [];
-    for (const [key, value] of this.cronJobs) {
-      if (!key.startsWith('cron_') && !key.startsWith('interval_')) {
-        activeJobs.push({
-          deviceId: key,
-          nextRun: value.nextRun,
-          startDate: value.startDate,
-          endDate: value.endDate
-        });
-      }
-    }
-    return activeJobs;
-  }
-
-  stopAllCronJobs() {
-    for (const [key, value] of this.cronJobs) {
-      if (value.timeoutId) {
-        clearTimeout(value.timeoutId);
-      }
-      if (value.intervalId) {
-        clearInterval(value.intervalId);
-      }
-      if (value.cronTask) {
-        value.cronTask.stop();
-      }
-    }
-    this.cronJobs.clear();
-    console.log('Semua cron job dihentikan');
-  }
-
-
   async restartWhatsapp() {
     try {
 
@@ -1186,19 +1287,18 @@ class NotifikasiWaService {
       const endJSON = cleanJSON.lastIndexOf(']') + 1;
 
       if (startJSON === -1 || endJSON === 0) {
-        throw new Error(`Terminal tidak mengembalikan JSON yang valid. Output: ${stdout}`);
+        console.error(`Terminal tidak mengembalikan JSON yang valid. Output: ${stdout}`);
       }
 
       const index = cleanJSON.slice(startJSON, endJSON);
       const processes = JSON.parse(index);
       const waProcess = processes.find((p) => p.name === processName);
 
-      if (!waProcess) throw new Error(`PM2 proses dengan nama "${processName}" tidak ditemukan!`);
+      if (!waProcess) console.error(`PM2 proses dengan nama ${processName} tidak ditemukan`);
 
       const waProcessId = waProcess.pm_id;
       const pathDelete = waProcess.pm2_env.pm_cwd;
 
-      // console.log(`stop proses id: ${waProcessId}`);
       await execPromise(`pm2 stop ${waProcessId}`);
 
       const pathFolderDelete = [
@@ -1206,8 +1306,6 @@ class NotifikasiWaService {
         path.join(pathDelete, ".wwebjs_cache"),
       ];
 
-      // console.log(`path: ${pathDelete}`);
-
       for (const dir of pathFolderDelete) {
         try {
           await fs.access(dir);
@@ -1221,12 +1319,19 @@ class NotifikasiWaService {
         }
       }
 
-      // console.log(`start proses id: ${waProcessId}`);
       await execPromise(`pm2 start ${waProcessId}`);
 
-      return { success: true, message: "WhatsApp has been restarted." };
+      return {
+        success: true,
+        message: "WhatsApp has been restarted."
+      };
+
     } catch (err) {
-      return { success: false, error: err.message || err };
+      return {
+        success: false,
+        message: `Gagal mengirim Whatsapp`
+      };
+      throw err
     }
   }
 }

services/sparepart.service.js

@@ -28,7 +28,10 @@ class SparepartService {
         throw new ErrorHandler(404, "Sparepart not found");
       }
 
-      sparepart[0].sparepart_yearly = JSON.parse(sparepart[0].sparepart_yearly);
+      if (sparepart[0]) {
+        if (sparepart[0].sparepart_yearly) sparepart[0].sparepart_yearly = JSON.parse(sparepart[0].sparepart_yearly);
+        if (sparepart[0].sparepart_monthly) sparepart[0].sparepart_monthly = JSON.parse(sparepart[0].sparepart_monthly);
+      }
 
       return sparepart[0];
     } catch (error) {
@@ -49,6 +52,10 @@ class SparepartService {
         data.sparepart_yearly = JSON.stringify(data.sparepart_yearly);
       }
 
+      if (data.sparepart_monthly) {
+        data.sparepart_monthly = JSON.stringify(data.sparepart_monthly);
+      }
+
       const created = await createSparepartDb(data);
       if (!created) throw new ErrorHandler(500, "Failed to create Sparepart");
       return created;
@@ -70,14 +77,17 @@ class SparepartService {
           data.sparepart_number,
           id
         );
-        if (exists)
-          throw new ErrorHandler(400, "Sparepart name already exists");
       }
 
       if (data.sparepart_yearly) {
         data.sparepart_yearly = JSON.stringify(data.sparepart_yearly);
       }
 
+      if (data.sparepart_monthly) {
+        data.sparepart_monthly = JSON.stringify(data.sparepart_monthly);
+      }
+
+
       const updated = await updateSparepartDb(id, data);
       if (!updated) throw new ErrorHandler(500, "Failed to update Sparepart");
       return await this.getSparepartById(id);

validate/device.schema.js

@@ -19,6 +19,9 @@ const insertDeviceSchema = Joi.object({
     listen_channel: Joi.string().max(100).required(),
     listen_channel_reminder: Joi.string().max(100).allow('', null),
     reminder_at: Joi.date().iso().allow('', null),
+    reminder_at_monthly: Joi.date().iso().allow('', null),
+    start_date: Joi.date().iso().allow('', null),
+    end_date: Joi.date().iso().allow('', null),
 });
 
 const updateDeviceSchema = Joi.object({
@@ -35,6 +38,9 @@ const updateDeviceSchema = Joi.object({
     listen_channel: Joi.string().max(100),
     listen_channel_reminder: Joi.string().max(100).allow('', null),
     reminder_at: Joi.date().iso().allow('', null),
+    reminder_at_monthly: Joi.date().iso().allow('', null),
+    start_date: Joi.date().iso().allow('', null),
+    end_date: Joi.date().iso().allow('', null),
 
 }).min(1);
 

validate/sparepart.schema.js

@@ -14,6 +14,11 @@ const insertSparepartSchema = Joi.object({
   sparepart_merk: Joi.string().max(255).optional(),
   sparepart_stok: Joi.string().max(255).optional(),
   sparepart_yearly: Joi.array()
+    .items(Joi.number().integer())
+    .min(0)
+    .allow(null)
+    .optional(),
+  sparepart_monthly: Joi.array()
     .items(Joi.number().integer())
     .min(0)
     .allow(null)
@@ -33,11 +38,17 @@ const updateSparepartSchema = Joi.object({
   sparepart_merk: Joi.string().max(255).optional(),
   sparepart_stok: Joi.string().max(255).optional(),
   sparepart_yearly: Joi.array()
+    .items(Joi.number().integer())
+    .min(0)
+    .allow(null)
+    .optional(),
+  sparepart_monthly: Joi.array()
     .items(Joi.number().integer())
     .min(0)
     .allow(null)
     .optional()
-});
+})
+
 module.exports = {
   insertSparepartSchema,
   updateSparepartSchema,