andi 2 năm trước cách đây
mục cha
commit
f29d0eed2d

+ 8 - 2
controller/sanksi.controller.js

@@ -17,7 +17,7 @@ exports.create = handleError(async (req, res) => {
   const { no_sanksi, keterangan, from_date, to_date } = req.body
   let { pelanggaran_id } = req.body
   const { laporan_id } = req.params
-  const files = req.files
+  const {dokumen:files, berita_acara} = req.files
   const user = req.user
 
   const isValid = validate(res, req.body, {
@@ -44,11 +44,16 @@ exports.create = handleError(async (req, res) => {
     })
   }
 
-  if (!files.length) {
+  if (!files) {
     return response.error(res, {
       message: 'dokumen harus ada',
     })
   }
+let dokumenBeritaAcara_id = null
+if (berita_acara) {
+const dokumenBeritaAcara = await addManyDokumen(berita_acara)
+dokumenBeritaAcara_id = dokumenBeritaAcara[0]
+}
 
   const dokumen = await addManyDokumen(files)
   const dokumen_id = dokumen.map((e) => e._id)
@@ -59,6 +64,7 @@ exports.create = handleError(async (req, res) => {
     pelanggaran: pelanggaran_id,
     keterangan,
     dokumen: dokumen_id,
+    berita_acara: dokumenBeritaAcara_id,
     masa_berlaku: {
       from_date,
       to_date,

+ 2 - 3
controller/user.controller.js

@@ -70,7 +70,7 @@ exports.addUserPublic = handleError(async (req, res) => {
 
   let notif = null
   if (isVerify !== 'false' && no_hp) {
-    notif = await notifWA2(
+    notifWA2(
       TEMPLATE_VERIFIKASI,
       { nama: nama || 'rahasia', no_hp: no_hp2 },
       [
@@ -78,7 +78,7 @@ exports.addUserPublic = handleError(async (req, res) => {
         { key: '3', value: 'no_verifikasi', value_text: no_verifikasi },
         { key: '2', value: 'no_laporan', value_text: no_laporan },
       ]
-    )
+    ).catch()
   }
 
   const accessToken = jwt.sign(
@@ -96,7 +96,6 @@ exports.addUserPublic = handleError(async (req, res) => {
   data = {
     token: `Bearer ${accessToken}`,
   }
-  if (notif) data.no_hp = no_hp && notif[0].status == 'success' ? true : false
 
   return response.success(res, {
     data,

+ 5 - 0
model/sanksi.model.js

@@ -16,6 +16,11 @@ module.exports = mongoose.model(
       pelanggaran: [{ type: Types.ObjectId, ref: pelanggaran }],
       keterangan: String,
       aktif: { type: Boolean, default: true },
+      berita_acara: 
+        {
+          type: Types.ObjectId,
+          ref: dokumen,
+        },
       dokumen: [
         {
           type: Types.ObjectId,

+ 5 - 0
model/sanksi2.model.js

@@ -14,6 +14,11 @@ module.exports = mongoose.model(
       sanksi: [{ description: String, label: String, level: Number }],
       keterangan: String,
       aktif: { type: Boolean, default: true },
+      berita_acara: 
+        {
+          type: Types.ObjectId,
+          ref: dokumen,
+        },
       dokumen: [
         {
           type: Types.ObjectId,

+ 1 - 1
routes/v1/sanksi/index.js

@@ -6,7 +6,7 @@ const roleId = require('../../../middleware/role')
 router.post(
   '/create/:laporan_id',
   roleId([2020, 2021, 2023]),
-  handleDokumen.array('dokumen'),
+  handleDokumen.fields([{name: 'dokumen'}, {name: 'berita_acara', maxCount: 1}]),
   sanksi.create
 )
 router.put(

+ 1 - 0
utils/cekData.js

@@ -140,6 +140,7 @@ exports.cekSatuDataSanksi = async (
       match: w,
     })
     .populate('dokumen')
+    .populate('berita_acara')
     .populate('pelanggaran')
     .populate('user')
     .populate('pengajuan.keberatan.dokumen')