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

Reviewed-on: #64

db/contact.db.js

@@ -25,6 +25,7 @@ const getAllContactDb = async (searchParams = {}) => {
       { column: "a.contact_name", param: searchParams.name, type: "string" },
       { column: "a.contact_type", param: searchParams.code, type: "string" },
       { column: "a.is_active", param: searchParams.active, type: "boolean" },
+      { column: "a.email", param: searchParams.email, type: "string" },
     ],
     queryParams
   );

db/device.db.js

@@ -63,7 +63,6 @@ const getAllDevicesDb = async (searchParams = {}) => {
   return { data: result.recordset, total };
 };
 
-
 const getDeviceByIdDb = async (id) => {
   const queryText = `
     SELECT 
@@ -116,12 +115,15 @@ const updateDeviceDb = async (id, data) => {
 };
 
 const deleteDeviceDb = async (id, deletedBy) => {
+  // Jika deletedBy adalah string, konversi ke integer atau gunakan default
+  const deletedById = typeof deletedBy === 'string' ? parseInt(deletedBy) || 0 : deletedBy || 0;
+  
   const queryText = `
     UPDATE m_device
     SET deleted_at = CURRENT_TIMESTAMP, deleted_by = $1
     WHERE device_id = $2 AND deleted_at IS NULL
   `;
-  await pool.query(queryText, [deletedBy, id]);
+  await pool.query(queryText, [deletedById, id]);
   return true;
 };
 
@@ -139,11 +141,68 @@ const getDeviceReminderChanelDb = async (id) => {
   return result.recordset;
 };
 
+const getDeviceReminderMonthlyDb = async (id) => {
+  const queryText = `
+    SELECT 
+    a.*,
+    b.brand_name,
+    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
+  `;
+  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 
+    a.*,
+    b.brand_name,
+    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 
+  `;
+  const result = await pool.query(queryText, [id]);
+  return result.recordset;
+};
+
+const updateDeviceReminderCustomDb = async (deviceId, startDate, endDate) => {
+  const queryText = `
+    UPDATE m_device
+    SET start_date = $1, 
+        end_date = $2,
+        updated_at = CURRENT_TIMESTAMP
+    WHERE device_id = $3 AND deleted_at IS NULL
+  `;
+  await pool.query(queryText, [startDate, endDate, deviceId]);
+  return getDeviceByIdDb(deviceId);
+};
+
+
 module.exports = {
   getAllDevicesDb,
   getDeviceByIdDb,
   createDeviceDb,
   updateDeviceDb,
   deleteDeviceDb,
-  getDeviceReminderChanelDb
+  getDeviceReminderChanelDb,
+  getDeviceReminderMonthlyDb,
+  getDeviceReminderCustomDb,
+  updateDeviceReminderCustomDb,
+  updateDeviceReminderMonthlyDb
 };

db/notification_error.db.js

@@ -255,6 +255,36 @@ const getReminderNotificationErrorByYearlyDb = async (errorCode, chanel, year) =
   return result.recordset[0];
 };
 
+const getReminderNotificationErrorByMonthlyDb = async (errorCode, monthly, deviceId) => {
+  const queryText = `
+    SELECT a.*
+    FROM notification_error a
+    WHERE a.error_code_id = $1 
+      AND MONTH(a.created_at) = $2
+      AND a.message_error_issue LIKE '%device_id: ' + CAST($3 AS VARCHAR) + '%'
+      AND a.is_active = 1
+      AND a.deleted_at IS NULL
+  `;
+
+  const result = await pool.query(queryText, [errorCode, monthly, deviceId]);
+  return result.recordset[0];
+};
+
+const getReminderNotificationErrorByCustomDb = async (errorCode, custom, deviceId) => {
+  const queryText = `
+    SELECT a.*
+    FROM notification_error a
+    WHERE a.error_code_id = $1 
+      AND a.created_at = $2
+      AND a.message_error_issue LIKE '%device_id: ' + CAST($3 AS VARCHAR) + '%'
+      AND a.is_active = 1
+      AND a.deleted_at IS NULL
+  `;
+
+  const result = await pool.query(queryText, [errorCode, custom, deviceId]);
+  return result.recordset[0];
+};
+
 module.exports = {
   getNotificationByIdDb,
   getDeviceNotificationByIdDb,
@@ -264,6 +294,8 @@ module.exports = {
   getUsersNotificationErrorDb,
   getDeviceChannelReminder,
   getReminderNotificationErrorByYearlyDb,
+  getReminderNotificationErrorByMonthlyDb,
+  getReminderNotificationErrorByCustomDb,
   updateNotificationErrorByChanelReminderDb
 
 };

db/sparepart.db.js

@@ -197,6 +197,42 @@ const getSparepartsByYearlyDb = async (yearly) => {
   return result.recordset;
 };
 
+const getSparepartsByMonthlyDb = async (monthly) => {
+
+  const queryText = `
+    SELECT *
+    FROM m_sparepart
+    WHERE deleted_at IS NULL
+    AND EXISTS (
+      SELECT 1
+      FROM OPENJSON(sparepart_monthly)
+      WHERE value = $1
+    )
+  `;
+
+  const result = await pool.query(queryText, [monthly]);
+
+  return result.recordset;
+};
+
+const getSparepartsByCustomDb = async (custom) => {
+
+  const queryText = `
+    SELECT *
+    FROM m_sparepart
+    WHERE deleted_at IS NULL
+    AND EXISTS (
+      SELECT 1
+      FROM OPENJSON(sparepart_custom)
+      WHERE value = $1
+    )
+  `;
+
+  const result = await pool.query(queryText, [custom]);
+
+  return result.recordset;
+};
+
 module.exports = {
   getAllSparepartDb,
   getSparepartByIdDb,
@@ -205,5 +241,7 @@ module.exports = {
   createSparepartDb,
   updateSparepartDb,
   deleteSparepartDb,
-  getSparepartsByYearlyDb
+  getSparepartsByYearlyDb,
+  getSparepartsByMonthlyDb,
+  getSparepartsByCustomDb
 };

package.json

@@ -29,6 +29,7 @@
     "cors": "^2.8.5",
     "crypto": "^1.0.1",
     "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.20",
     "dotenv": "^8.2.0",
     "exceljs": "^4.4.0",
     "express": "^4.18.2",
@@ -44,6 +45,7 @@
     "mqtt": "^5.14.0",
     "mssql": "^11.0.1",
     "multer": "^1.4.5-lts.2",
+    "node-cron": "^4.5.0",
     "nodemailer": "^6.8.0",
     "pg": "^8.8.0",
     "pino": "^6.11.3",

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,4 +14,73 @@ router.post('/restart-wa', async (req, res) => {
   }
 });
 
+router.post('/reminder-monthly/:id', verifyToken.verifyAccessToken, verifyAccess(), async (req, res) => {
+  try {
+    const { id } = req.params;
+    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', verifyToken.verifyAccessToken, verifyAccess(), async (req, res) => {
+  try {
+    const { id } = req.params;
+    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) {
+    return res.status(500).json(error);
+  }
+});
+
+// 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', 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/log.json

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

scheduler/reminder.json

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

services/notification_error.service.js

@@ -31,7 +31,7 @@ const {
 } = require("../db/notification_wa.db");
 
 const { ErrorHandler } = require("../helpers/error");
-const { getSparepartsByYearlyDb } = require("../db/sparepart.db");
+const { getSparepartsByYearlyDb, getSparepartsByMonthlyDb } = require("../db/sparepart.db");
 
 const notifikasiWaService = require("./notifikasi-wa.service");
 
@@ -140,11 +140,18 @@ class NotificationService {
       notification.is_reminder = false;
       notification.spareparts_reminder = [];
       if (notification.message_error_issue) {
-        const sparepartsReminder = await getSparepartsByYearlyDb(notification.error_code_id);
 
-        notification.spareparts_reminder = sparepartsReminder ?? [];
+        const [sparepartsYearly, sparepartsMonthly] = await Promise.all([
+          getSparepartsByYearlyDb(notification.error_code_id),
+          getSparepartsByMonthlyDb(notification.error_code_id)
+        ]);
+
+        notification.spareparts_reminder = [
+          ...(sparepartsYearly ?? []),
+          ...(sparepartsMonthly ?? [])
+        ];
+
         notification.is_reminder = true;
-
       }
 
       return notification;

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/contact.schema.js

@@ -13,7 +13,8 @@ const insertContactSchema = Joi.object({
         "Phone number must be a valid Indonesian number in format +628XXXXXXXXX",
     }),
   is_active: Joi.boolean().required(),
-  contact_type: Joi.string().max(255).optional().allow(null)
+  contact_type: Joi.string().max(255).optional().allow(null),
+  email: Joi.string().email().optional().allow(null)
 });
 
 const updateContactSchema = Joi.object({
@@ -26,7 +27,8 @@ const updateContactSchema = Joi.object({
         "Phone number must be a valid Indonesian number in format +628XXXXXXXXX",
     }),
   is_active: Joi.boolean().optional(),
-  contact_type: Joi.string().max(255).optional().allow(null)
+  contact_type: Joi.string().max(255).optional().allow(null),
+  email: Joi.string().email().optional().allow(null)
 });
 
 module.exports = {

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,