commit

controller/v1/auto.controller.js

@@ -45,7 +45,7 @@ exports.keberatan = handleError(async (req, res) => {
     })
   }
 
-  Promise.all(
+  await Promise.all(
     dataSanksi.map(
       async (sanksi) =>
         await sanksiModel.findByIdAndUpdate(sanksi._id, {
@@ -87,7 +87,7 @@ exports.banding = handleError(async (req, res) => {
     })
   }
 
-  Promise.all(
+  await Promise.all(
     dataSanksi.map(
       async (sanksi) => {
         // await notifWA(TEMPLATE_BANDING, [
@@ -257,7 +257,7 @@ exports.updateStatusSanksi = handleError(async (req, res) => {
     aktif: true,
   })
 
-  Promise.all(
+  await Promise.all(
     sanksi.map(async (e) =>
       sanksiModel.findByIdAndUpdate(e._id, {
         aktif: false,

controller/v1/laporan.controller.js

@@ -117,103 +117,6 @@ exports.create = handleError(async (req, res) => {
   })
 })
 
-// exports.public = handleError(async (req, res) => {
-//   const isValid = validate(res, req.body, {
-//     nama: 'string',
-//     email: 'email',
-//     alamat: 'string',
-//     no_hp: 'string',
-//     no_laporan: 'string',
-//     pt_id: 'string',
-//     pelanggaran_id: 'string',
-//     keterangan: 'string',
-//     is_private: { type: 'string', enum: ['true', 'false'] },
-//   })
-//   if (!isValid) return
-
-//   const {
-//     no_laporan,
-//     pt_id,
-//     keterangan,
-//     nama,
-//     email,
-//     alamat,
-//     no_hp,
-//     is_private,
-//   } = req.body
-//   let { pelanggaran_id } = req.body
-
-//   const pt = await axios.get(
-//     `https://api.kemdikbud.go.id:8243/pddikti/1.2/pt/${pt_id}`
-//   )
-//   if (!pt) {
-//     return response.error(res, {
-//       message: 'pt_id tidak ditemukan',
-//     })
-//   }
-
-//   const { dokumen, foto } = req.files
-//   if (!foto.length) {
-//     return response.error(res, {
-//       message: 'foto harus ada',
-//     })
-//   }
-//   const foto_id = await addDokumen(foto[0])
-//   const user = await userModel.create({
-//     nama,
-//     email,
-//     no_hp,
-//     alamat,
-//     isPublic: true,
-//     isPrivate: is_private === 'true',
-//     foto: foto_id,
-//   })
-//   let dokumen_id = []
-//   if (dokumen?.length) {
-//     const dataDokumen = await addManyDokumen(dokumen)
-//     dokumen_id = dataDokumen.map((e) => e._id)
-//   }
-
-//   pelanggaran_id = pelanggaran_id.split(',')
-//   const pelanggaran = await pelanggaranModel.find({
-//     _id: {
-//       $in: pelanggaran_id,
-//     },
-//   })
-//   if (!pelanggaran.length)
-//     return response.error(res, { message: 'pelanggaran_id tidak ada' })
-
-//   let data = {
-//     no_laporan,
-//     user: user._id,
-//     dokumen: dokumen_id,
-//     pt: pt[0],
-//     pelanggaran: pelanggaran_id,
-//     keterangan,
-//     role_data: 'dikti',
-//   }
-
-//   data = await laporanModel.create(data)
-//   await pemantauanModel.create({
-//     laporan: data._id,
-//     pt_id: pt[0].id,
-//     user: user._id,
-//     keterangan: 'Mengajukan Laporan',
-//     dokumen: dokumen_id,
-//     for_pt: false,
-//   })
-//   await notifWA('d5609c3c-e9e9-4dbe-9a4e-e8fa772d6770', [
-//     { key: '1', value: 'nama', value_text: nama },
-//     { key: '2', value: 'pt', value_text: pt[0].nama },
-//     { key: '3', value: 'keterangan', value_text: keterangan },
-//     { key: '4', value: 'no_laporan', value_text: no_laporan },
-//   ])
-//   return response.success(res, {
-//     message: 'Berhasil menambah laporan',
-//     data,
-//   })
-// })
-
 exports.public = handleError(async (req, res) => {
   const user = req.user
   const no_laporan = req.no_laporan
@@ -661,63 +564,6 @@ exports.laporanByPembina = handleError(async (req, res) => {
         return { ...e, step }
       })
   }
-
-  // if (isSanksi === true) {
-  //   laporan = (await sanksiModel.find(where).populate({path: 'laporan', match: {'pt.pembina.id': idPembina} }).lean())
-  //     .filter(e => e.laporan)
-  //     .map(e => {
-  //       let step = 'Sanksi'
-  //       if (e.pengajuan?.cabut_sanksi) step = 'Cabut Sanksi'
-  //       else if (e.pengajuan?.keberatan && !e.sanksi?.pengajuan?.banding) step = 'Keberatan'
-  //       else if (e.pengajuan?.banding) step = 'Banding'
-  //       else if (e.aktif === false && !e.masa_berlaku?.from_date) step = 'Selesai'
-  //       else if (e.aktif === false && e.jawaban?.cabut_sanksi?.status === 'Diterima') step = 'Diterima'
-  //       return { ...e, step }
-  //     })
-  // } else {
-  //   laporan = (await laporanModel.find({ ...where, 'pt.pembina.id': idPembina }).lean().populate('sanksi').lean())
-  //     .filter(e => e.sanksi)
-  //     .map(e => {
-  //       let step = 'Pelaporan'
-  //       if (e.jadwal && !e.evaluasi.length) step = 'Penjadwalan'
-  //       else if (e.evaluasi.length && !e.sanksi) step = 'Pemeriksaan'
-  //       else if (e.sanksi?.pengajuan?.cabut_sanksi) step = 'Cabut Sanksi'
-  //       else if (e.sanksi?.pengajuan?.keberatan && !e.sanksi?.pengajuan?.banding) step = 'Keberatan'
-  //       else if (e.sanksi?.aktif === false && !e.sanksi?.masa_berlaku?.from_date) step = 'Selesai'
-  //       else if (e.sanksi?.aktif === false && e.jawaban?.cabut_sanksi?.status === 'Diterima') step = 'Diterima'
-  //       else if (e.sanksi?.pengajuan?.banding) step = 'Banding'
-  //       else if (e.sanksi) step = 'Sanksi'
-  //       return { ...e, step }
-  //     })
-  // }
-
-  // const [laporan, dataSanksi] = await Promise.all([
-  //   (async () => {
-  //     let laporan = isLaporan
-  //       ? await cekBanyakDataLaporan(user, {
-  //         'pt.pembina.id': idPembina,
-  //         all: true,
-  //         ...where,
-  //       }, {lean: true})
-  //       : []
-  //     if (!laporan.length) return []
-
-  //     return laporan
-  //   })(),
-  //   (async () =>
-  //     isSanksi
-  //       ? (
-  //         await cekBanyakDataSanksi(
-  //           user,
-  //           { all: true, ...where },
-  //           {
-  //             ['pt.pembina.id']: idPembina,
-  //           }
-  //         )
-  //       ).filter((e) => e.laporan != null)
-  //       : [])(),
-  // ])
-
   return response.success(res, {
     message: 'berhasil get laporan by pembina',
     data: laporan,

controller/v1/log.controller.js

@@ -2,6 +2,7 @@ const logModel = require('../../model/log.model')
 const handleError = require('../../utils/v1/handleError')
 const response = require('../../utils/responseHandler')
 const { validate } = require('../../utils/v1/validation')
+const moment = require('moment')
 
 exports.create = handleError(async (req, res) => {
   const user = req.user
@@ -28,7 +29,17 @@ exports.create = handleError(async (req, res) => {
 })
 
 exports.all = handleError(async (req, res) => {
-  const log = await logModel.find().populate('user').sort({ createdAt: -1 })
+  const {from_date, to_date} = req.query
+  let query = {}
+  if (from_date && to_date) {
+    query = {
+      createdAt: {
+        $gte: moment(from_date).startOf('day').toDate(),
+        $lte: moment(to_date).endOf('day').toDate(),
+      },
+    }
+  }
+  const log = await logModel.find(query).populate('user').sort({ createdAt: -1 })
 
   return response.success(res, {
     data: log,