commit lagi aja dah

controller/sanksi.controller.js

@@ -173,8 +173,11 @@ exports.getAll = handleError(async (req, res) => {
     perbaikan,
     aktif,
     delegasi,
+    naikSanksi,
+    turunSanksi,
   } = req.query
   const where = {}
+  const q = {}
   if (aktif && aktif === 'false') {
     where.aktif = false
   }
@@ -206,7 +209,13 @@ exports.getAll = handleError(async (req, res) => {
   if (delegasi === 'true') {
     where.delegasi = true
   }
-  const data = await cekBanyakDataSanksi(user, where)
+  if (naikSanksi === 'true') {
+    q.level_sanksi = { $in: [1, 2] }
+  }
+  if (turunSanksi === 'true') {
+    q.level_sanksi = { $in: [2, 3] }
+  }
+  const data = await cekBanyakDataSanksi(user, where, q)
   return response.success(res, {
     message: 'Berhasil ambil data Sanksi',
     data,

utils/cekData.js

@@ -191,13 +191,13 @@ exports.cekBanyakDataSanksi = async (user, where = {}, q = {}) => {
       populate: ['pelanggaran'],
     })
     .populate('user')
-    .populate('pelanggaran')
+    .populate({ path: 'pelanggaran', match: w })
     .populate('riwayat_sanksi.dokumen')
     .select('-dokumen')
     .sort({
       createdAt: -1,
     })
-  data = data.filter((e) => e.laporan !== null)
+  data = data.filter((e) => e.laporan !== null || e.pelanggaran.length)
   return data
 }