yazid138 2 年之前
父節點
當前提交
1494be6d58

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

@@ -237,6 +237,10 @@ exports.updateStatusSanksi = handleError(async (req, res) => {
       $lte: new Date().toISOString(),
     },
     aktif: true,
+    'masa_berlaku.berakhir': {
+      $exists: false,
+      $eq: null
+    }
   }).populate('laporan')
 
   await Promise.all(
@@ -246,12 +250,10 @@ exports.updateStatusSanksi = handleError(async (req, res) => {
         sanksi: e._id,
         action: UPDATE_SANKSI,
         pt_id: e.laporan.pt.id,
-        keterangan: 'Sanksi sudah berakhir'
-      })
-      await sanksiModel.findByIdAndUpdate(e._id, {
-        aktif: false,
-      })
+        keterangan: 'Masa berlaku sanksi sudah melewati TMT'
       })
+      await sanksiModel.findByIdAndUpdate(e._id, { 'masa_berlaku.berakhir': true })
+    })
   )
 
   return response.success(res, {

+ 24 - 11
controller/v1/migrasi.controller.js

@@ -10,13 +10,13 @@ exports.pengajuan = handleError(async (req, res) => {
     (() =>
       sanksiModel.find({
         ['pengajuan.keberatan']: { $ne: null, $exists: true },
-        is_pengajuan_keberatan: { $eq: null, $exists: false },
+        is_pengajuan_keberatan: { $eq: null, $exists: false }
       }))(),
     (() =>
       sanksiModel.find({
         ['jawaban.keberatan']: { $ne: null, $exists: true },
         ['pengajuan.banding']: { $ne: null, $exists: true },
-        is_pengajuan_banding: { $eq: null, $exists: false },
+        is_pengajuan_banding: { $eq: null, $exists: false }
       }))()
   ])
   await Promise.all([
@@ -29,7 +29,7 @@ exports.pengajuan = handleError(async (req, res) => {
   ])
 
   return response.success(res, {
-    message: 'Berhasil migrasi pengajuan',
+    message: 'Berhasil migrasi pengajuan'
   })
 })
 
@@ -46,25 +46,27 @@ exports.dokumen = handleError(async (req, res) => {
   }))
 
   return response.success(res, {
-    message: 'Berhasil migrasi dokumen',
+    message: 'Berhasil migrasi dokumen'
   })
 })
 
 exports.pelanggaranSanksi = handleError(async (req, res) => {
-  const sanksi = await sanksiModel.find({sanksi: {
-     $eq: [],
-  }}).populate('pelanggaran')
+  const sanksi = await sanksiModel.find({
+    sanksi: {
+      $eq: []
+    }
+  }).populate('pelanggaran')
 
- if(sanksi?.length) await Promise.all(sanksi.map(async e => {
+  if (sanksi?.length) await Promise.all(sanksi.map(async e => {
     await sanksiModel.findOneAndUpdate({
       _id: e._id
     }, {
-      sanksi: e.pelanggaran.map(e2 => ({label: e2.label_sanksi, description: e2.sanksi, level: e2.level_sanksi}))
-   })
+      sanksi: e.pelanggaran.map(e2 => ({ label: e2.label_sanksi, description: e2.sanksi, level: e2.level_sanksi }))
+    })
   }))
 
   return response.success(res, {
-    message: 'Berhasil migrasi pelanggaran sanksi',
+    message: 'Berhasil migrasi pelanggaran sanksi'
   })
 })
 
@@ -89,4 +91,15 @@ exports.tambahStep = handleError(async (req, res) => {
   return laporan
 })
 
+exports.backToSanksi = handleError(async (req, res) => {
+  const sanksi = await sanksiModel.find({
+    'masa_berlaku.to_date': {
+      $lte: new Date().toISOString()
+    },
+    aktif: false
+  })
+  await Promise.all(sanksi.map(e => sanksiModel.findOneAndUpdate({ _id: e._id }, { aktif: true, 'masa_berlaku.berakhir': true })))
+  return sanksi
+})
+
 

+ 1 - 0
model/sanksi.model.js

@@ -50,6 +50,7 @@ module.exports = mongoose.model(
       masa_berlaku: new Schema({
         from_date: Date,
         to_date: Date,
+        berakhir: Boolean,
       }),
       batas_waktu: {
         keberatan: Date,

+ 1 - 0
model/sanksi2.model.js

@@ -48,6 +48,7 @@ module.exports = mongoose.model(
       masa_berlaku: new Schema({
         from_date: Date,
         to_date: Date,
+        berakhir: Boolean,
       }),
       batas_waktu: {
         keberatan: Date,

+ 1 - 0
routes/v1/migration.routes.js

@@ -5,5 +5,6 @@ router.put('/pengajuan', migrasi.pengajuan)
 router.put('/dokumen', migrasi.dokumen)
 router.put('/pelanggaran-sanksi', migrasi.pelanggaranSanksi)
 router.put('/tambah-step', migrasi.tambahStep)
+router.put('/back-to-sanksi', migrasi.backToSanksi)
 
 module.exports = router