yazid138 2 anni fa
parent
commit
ea4f5872a4
2 ha cambiato i file con 22 aggiunte e 15 eliminazioni
  1. 13 5
      controller/v1/auto.controller.js
  2. 9 10
      controller/v1/sanksi.controller.js

+ 13 - 5
controller/v1/auto.controller.js

@@ -5,13 +5,14 @@ const sanksiModel = require('../../model/sanksi.model')
 const laporanModel = require('../../model/laporan.model')
 const {
   TEMPLATE_REMINDER,
-  TEMPLATE_REMINDER2, TRUE,
+  TEMPLATE_REMINDER2, TRUE, UPDATE_SANKSI,
 } = require('../../utils/constanta')
 const moment = require('moment')
 const autoSaveModel = require('../../model/autoSave.model')
 const { cekSatuDataSanksi, cekSatuDataLaporan } = require('../../utils/v1/cekData')
 const logModel = require('../../model/log.model')
 const kontakModel = require('../../model/kontak.model')
+const pemantauanModel = require('../../model/pemantauan.model')
 
 exports.keberatan = handleError(async (req, res) => {
   const dataSanksi = await sanksiModel
@@ -236,14 +237,21 @@ exports.updateStatusSanksi = handleError(async (req, res) => {
       $lte: new Date().toISOString(),
     },
     aktif: true,
-  })
+  }).populate('laporan')
 
   await Promise.all(
-    sanksi.map(async (e) =>
-      sanksiModel.findByIdAndUpdate(e._id, {
+    sanksi.map(async (e) => {
+      await pemantauanModel.create({
+        laporan: e.laporan._id,
+        sanksi: e._id,
+        action: UPDATE_SANKSI,
+        pt_id: e.laporan.pt.id,
+        keterangan: 'Sanksi sudah berakhir'
+      })
+      await sanksiModel.findByIdAndUpdate(e._id, {
         aktif: false,
       })
-    )
+      })
   )
 
   return response.success(res, {

+ 9 - 10
controller/v1/sanksi.controller.js

@@ -268,11 +268,19 @@ exports.updatePt = handleError(async (req, res) => {
     }
     data = { is_pengajuan_banding: is_pengajuan_banding === TRUE }
     flag = is_pengajuan_banding === TRUE ? BANDING : PERBAIKAN
+
+    await pemantauanModel.create({
+      laporan: sanksi.laporan._id,
+      sanksi: sanksi._id,
+      action: UPDATE_SANKSI,
+      pt_id: sanksi.laporan.pt.id,
+      user: user._id,
+      keterangan
+    })
   }
 
   if (is_dokumen_perbaikan === TRUE) {
     last_step = 'Dokumen Perbaikan'
-    keterangan = 'Mengupload Dokumen Perbaikan'
     flag = PERBAIKAN
   }
 
@@ -282,15 +290,6 @@ exports.updatePt = handleError(async (req, res) => {
     })
   }
 
-  await pemantauanModel.create({
-    laporan: sanksi.laporan._id,
-    sanksi: sanksi._id,
-    action: UPDATE_SANKSI,
-    pt_id: sanksi.laporan.pt.id,
-    user: user._id,
-    keterangan
-  })
-
   data.last_step = last_step
   data2.flag = flag
   const checkStep = await laporanModel.findOne({ sanksi: sanksi._id, step: flag })