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

Reviewed-on: #62

routes/notifikasi-wa.route.js

@@ -1,8 +1,5 @@
 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) => {
@@ -14,10 +11,10 @@ router.post('/restart-wa', async (req, res) => {
   }
 });
 
-router.post('/reminder-monthly/:id', verifyToken.verifyAccessToken, verifyAccess(), async (req, res) => {
+router.post('/reminder-monthly/:id', async (req, res) => {
   try {
     const { id } = req.params;
-    const { reminder_at_monthly } = req.body;
+    const {reminder_at_monthly} = req.body
     const result = await NotifikasiWaService.onMonthlyReminder(id, reminder_at_monthly);
     return res.status(200).json(result);
   } catch (error) {
@@ -25,7 +22,7 @@ router.post('/reminder-monthly/:id', verifyToken.verifyAccessToken, verifyAccess
   }
 });
 
-router.post('/reminder-custom/:id', verifyToken.verifyAccessToken, verifyAccess(), async (req, res) => {
+router.post('/reminder-custom/:id', async (req, res) => {
   try {
     const { id } = req.params;
     const {start_date, end_date} = req.body;
@@ -36,51 +33,52 @@ router.post('/reminder-custom/:id', verifyToken.verifyAccessToken, verifyAccess(
   }
 });
 
-// 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 
+    });
+  }
+});
 
-// 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 
-//     });
-//   }
-// });
+// 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 
+    });
+  }
+});
 
 module.exports = router;

services/notifikasi-wa.service.js

@@ -616,6 +616,7 @@ class NotifikasiWaService {
 
   async onMonthlyReminder(deviceId, reminderMonthly) {
     try {
+      console.log(`🔄 Memulai onMonthlyReminder untuk device ID: ${deviceId}`);
 
       const paramDb = {
         limit: 100,
@@ -624,9 +625,12 @@ class NotifikasiWaService {
         active: true,
       };
 
+      // 1. Validasi device
+      console.log(`📡 Mengambil data device dengan ID: ${deviceId}`);
       const devices = await getDeviceReminderMonthlyDb(deviceId);
 
       if (!devices || devices.length === 0) {
+        console.error(`❌ Device dengan ID ${deviceId} tidak ditemukan`);
         return {
           success: false,
           message: `Device dengan ID ${deviceId} tidak ditemukan di database`
@@ -637,14 +641,19 @@ class NotifikasiWaService {
       const deviceName = device.device_name;
       const currentDeviceId = device.device_id;
 
+      console.log(`✅ Device ditemukan: ${deviceName} (ID: ${currentDeviceId})`);
+
+      // 2. Validasi dan update reminder_at_monthly jika diperlukan
       let targetReminderTime = device.reminder_at_monthly;
+      console.log(`📅 Reminder time dari DB: ${targetReminderTime}`);
 
       if (reminderMonthly) {
+        console.log(`📝 Mengupdate reminder time ke: ${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'
+            message: 'Format reminderMonthly tidak valid. Gunakan format YYYY-MM-DD HH:mm:ss'
           };
         }
 
@@ -652,30 +661,40 @@ class NotifikasiWaService {
         if (!updatedDevice) {
           return {
             success: false,
-            message: 'Gagal mengupdate Reminder Monthly.'
+            message: 'Gagal mengupdate reminder monthly.'
           };
         }
 
         targetReminderTime = reminderMonthly;
-
+        console.log(`✅ Reminder time berhasil diupdate ke: ${targetReminderTime}`);
       } else if (!targetReminderTime) {
+        console.log(`⚠️ Tidak ada reminder time, setting default ke sekarang + 1 jam`);
         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.'
+            message: 'Gagal mengupdate reminder monthly dengan default time.'
           };
         }
         targetReminderTime = reminderTime;
+        console.log(`✅ Default reminder time: ${targetReminderTime}`);
       }
 
+      console.log(`📅 Target reminder time: ${targetReminderTime}`);
+
+      // 3. Parse target reminder time
       const reminderAt = dayjs.tz(targetReminderTime, this.timeZone);
       const now = dayjs().tz(this.timeZone);
+
+      console.log(`🕐 Waktu sekarang: ${now.format('YYYY-MM-DD HH:mm:ss')}`);
+      console.log(`🕐 Waktu reminder: ${reminderAt.format('YYYY-MM-DD HH:mm:ss')}`);
+
+      // 4. Jika sudah lewat atau sama, langsung kirim (sama seperti onCustomReminder)
       const isEndDatePassed = now.isAfter(reminderAt) || now.isSame(reminderAt);
 
       if (isEndDatePassed) {
+        console.log(`⏰ Reminder time sudah terlewati, mengirim reminder sekarang untuk ${deviceName}`);
         const sendResult = await this.sendMonthlyReminderNow(
           currentDeviceId,
           deviceName,
@@ -684,8 +703,13 @@ class NotifikasiWaService {
         return sendResult;
       }
 
+      // 5. Jika belum waktunya, jadwalkan cron job (sama seperti onCustomReminder)
+      console.log(`⏰ Menjadwalkan reminder untuk ${deviceName} pada ${reminderAt.format('YYYY-MM-DD HH:mm:ss')}`);
+
+      // Stop cron job lama jika ada
       this.stopCronJob(currentDeviceId);
 
+      // Schedule cron job
       const scheduleResult = await this.scheduleMonthlyReminderJob(
         currentDeviceId,
         deviceName,
@@ -695,11 +719,19 @@ class NotifikasiWaService {
       return {
         success: true,
         message: `Reminder berhasil dijadwalkan untuk device ${deviceName}`,
+        schedule: scheduleResult,
+        nextRun: scheduleResult.nextRun
       };
 
-    } catch (err) {
-      console.error('Error on Monthly Reminder:', err);
-      throw err
+    } catch (error) {
+      console.error('❌ Error onMonthlyReminder:', error);
+      console.error('❌ Stack trace:', error.stack);
+      return {
+        success: false,
+        message: 'Error pada onMonthlyReminder: ' + error.message,
+        error: error,
+        stack: error.stack
+      };
     }
   }
 
@@ -788,6 +820,7 @@ class NotifikasiWaService {
 
   async sendMonthlyReminderNow(deviceId, deviceName, reminderAt) {
     try {
+      console.log(`Mengirim reminder untuk ${deviceName}`);
 
       const paramDb = {
         limit: 100,
@@ -808,6 +841,7 @@ class NotifikasiWaService {
       );
 
       if (checkNotifExist) {
+        console.log(`Reminder untuk ${deviceName} bulan ${currentMonth} sudah pernah dibuat`);
         return {
           success: false,
           message: `Reminder untuk device ${deviceName} sudah pernah dibuat.`
@@ -923,12 +957,14 @@ 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 monthly reminder now:', error);
       throw error;
     }
   }
@@ -945,7 +981,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'
         };
       }
 
@@ -955,14 +991,14 @@ class NotifikasiWaService {
       if (!startDateObj.isValid() || !endDateObj.isValid()) {
         return {
           success: false,
-          message: 'Format tanggal Start Date dan End Date tidak valid. Gunakan format: YYYY-MM-DD HH:mm:ss'
+          message: 'Format tanggal 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'
         };
       }
 
@@ -989,6 +1025,8 @@ class NotifikasiWaService {
         };
       }
 
+      console.log(`Berhasil update start_date dan end_date untuk device ${deviceName}`);
+
       this.stopCronJob(currentDeviceId);
 
       const scheduleResult = await this.scheduleCustomReminderJob(
@@ -1013,12 +1051,16 @@ 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) {
@@ -1037,6 +1079,10 @@ 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 {
@@ -1047,8 +1093,8 @@ class NotifikasiWaService {
             await this.sendCustomReminderNow(deviceId, deviceName, startDateObj, endDateObj);
           }
           
-        } catch (err) {
-          throw err
+        } catch (error) {
+          console.error(`Gagal mengirim reminder untuk ${deviceName}:`, error);
         }
       });
 
@@ -1063,8 +1109,10 @@ 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);
@@ -1080,21 +1128,18 @@ class NotifikasiWaService {
             if (!checkNotifExist) {
               await this.sendCustomReminderNow(deviceId, deviceName, startDateObj, endDateObj);
             } else {
-              return {
-                success: false,
-                message: `Reminder untuk ${deviceName} sudah pernah dikirim`
-              };
+              console.log(`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 (err) {
-          throw err
+        } catch (error) {
+          console.error(`Backup cron job gagal untuk ${deviceName}:`, error);
         }
-
       }, {
         timezone: this.timeZone
       });
@@ -1121,13 +1166,7 @@ class NotifikasiWaService {
 
   async sendCustomReminderNow(deviceId, deviceName, startDateObj, endDateObj) {
     try {
-
-      const paramDb = {
-        limit: 100,
-        page: 1,
-        criteria: "",
-        active: true,
-      };
+      console.log(`Mengirim reminder untuk ${deviceName}`);
 
       const now = dayjs().tz(this.timeZone);
       const currentMonth = now.month() + 1;
@@ -1140,6 +1179,7 @@ class NotifikasiWaService {
       );
 
       if (checkNotifExist) {
+        console.log(`Reminder untuk ${deviceName} sudah pernah dibuat`);
         return {
           success: false,
           message: `Reminder untuk device ${deviceName} sudah pernah dibuat.`
@@ -1158,6 +1198,12 @@ 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;
 
@@ -1213,7 +1259,7 @@ class NotifikasiWaService {
           }
 
           if (resultSend.success) {
-            isSendNotification = true;
+            isSendNotification = resultSend.success;
           }
         }
       }
@@ -1244,11 +1290,12 @@ class NotifikasiWaService {
 
       this.stopCronJob(deviceId);
 
+      console.log(`Reminder berhasil dikirim untuk ${deviceName}`);
       return { success: true, message: "Reminder has been sent." };
 
-    } catch (err) {
-      console.error('Error sending reminder now:', err);
-      throw err;
+    } catch (error) {
+      console.error('Error sending reminder now:', error);
+      throw error;
     }
   }
 
@@ -1276,6 +1323,8 @@ class NotifikasiWaService {
     this.cronJobs.delete(`interval_${deviceId}`);
   }
 
+
+
   async restartWhatsapp() {
     try {
 
@@ -1287,18 +1336,19 @@ class NotifikasiWaService {
       const endJSON = cleanJSON.lastIndexOf(']') + 1;
 
       if (startJSON === -1 || endJSON === 0) {
-        console.error(`Terminal tidak mengembalikan JSON yang valid. Output: ${stdout}`);
+        throw new 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) console.error(`PM2 proses dengan nama ${processName} tidak ditemukan`);
+      if (!waProcess) throw new 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 = [
@@ -1306,6 +1356,8 @@ class NotifikasiWaService {
         path.join(pathDelete, ".wwebjs_cache"),
       ];
 
+      // console.log(`path: ${pathDelete}`);
+
       for (const dir of pathFolderDelete) {
         try {
           await fs.access(dir);
@@ -1319,19 +1371,12 @@ 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,
-        message: `Gagal mengirim Whatsapp`
-      };
-      throw err
+      return { success: false, error: err.message || err };
     }
   }
 }

services/sparepart.service.js

@@ -28,10 +28,7 @@ class SparepartService {
         throw new ErrorHandler(404, "Sparepart not found");
       }
 
-      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);
-      }
+      sparepart[0].sparepart_yearly = JSON.parse(sparepart[0].sparepart_yearly);
 
       return sparepart[0];
     } catch (error) {
@@ -52,10 +49,6 @@ 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;
@@ -77,17 +70,14 @@ 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,9 +19,6 @@ 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({
@@ -38,9 +35,6 @@ 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,11 +14,6 @@ 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)
@@ -38,17 +33,11 @@ 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,