commit

controller/v1/auth.controller.js

@@ -60,10 +60,6 @@ exports.login = handleError(async (req, res) => {
     }
   }
 
-  //if (process.env.ENV === 'production') {
-  /*} else {
-    role = user.peran.filter((e) => roleData.includes(e.peran.id))[0]
-  }*/
   let dataRole = {
     id: role.peran.id,
     nama: role.peran.nama,
@@ -82,10 +78,6 @@ exports.login = handleError(async (req, res) => {
       isPrivate: false,
     })
   } else {
-    //if (process.env.ENV === 'production') {
-    // if (cekUser.role.id !== role.peran.id) {
-    //   await userModel.updateOne({ _id: cekUser._id }, { role: dataRole })
-    // }
     if (!cekUser.lembaga) {
       await userModel.updateOne(
         { _id: cekUser._id },
@@ -97,7 +89,6 @@ exports.login = handleError(async (req, res) => {
         user_id: user.id,
       })
     }
-    //}
   }
 
   const accessToken = jwt.sign({ _id: cekUser._id }, process.env.SRU51, {
@@ -141,13 +132,13 @@ exports.loginToPT = handleError(async (req, res) => {
   let user = req.user
   const { lembaga_id, password } = req.body
   let cekUser = await pddiktiService.login({username: user.email, password})
-  if (cekUser && cekUser.code === 400)
+  if (cekUser.code && cekUser.code !== 200)
     return response.error(res, {
-    code: 400,
-    message: 'password salah',
+    code: 401,
+    message: cekUser.message,
   })
 
-  const dataLembaga = await pddiktiService.getPembina({search: lembaga_id})
+  const dataLembaga = await pddiktiService.getPT(lembaga_id)
 
   await userModel.updateOne({
     _id: user._id

controller/v1/laporan.controller.js

@@ -136,8 +136,7 @@ exports.public = handleError(async (req, res) => {
   let { pelanggaran_id } = req.body
   if (no_verifikasi && user.no_verifikasi !== no_verifikasi) {
     return response.error(res, {
-      message: 'no_verifikasi tidak sesuai',
-      error: { no_verifikasi: 'No. Verifikasi tidak sesuai' },
+      message: 'Kode Verifikasi Salah',
     })
   } else if (no_verifikasi && user.no_verifikasi === no_verifikasi) {
     level = 3

controller/v1/lembaga.controller.js

@@ -4,7 +4,7 @@ const pddiktiService = require('../../services/v2/pddikti.service')
 
 exports.get = handleError(async (req, res) => {
   const { search } = req.query
-  const data = (await pddiktiService.getPembina({search})).map((e) => ({ id: e.id, nama: e.nama }))
+  const data = (await pddiktiService.getPembina(null,{search})).map((e) => ({ id: e.id, nama: e.nama }))
   return response.success(res, {
     message: 'Berhasil mengambil data lembaga',
     data,

controller/v1/log.controller.js

@@ -11,7 +11,7 @@ exports.create = handleError(async (req, res) => {
   const isValid = validate(res, req.body, {
     aktivitas: 'string',
     os: 'string',
-    ipv4: 'string',
+    ipv4: 'string'
   })
   if (!isValid) return
 
@@ -20,28 +20,25 @@ exports.create = handleError(async (req, res) => {
     aktivitas,
     os,
     ipv4,
-    menu,
+    menu
   })
 
   return response.success(res, {
-    message: 'log berhasil dibuat',
+    message: 'log berhasil dibuat'
   })
 })
 
 exports.all = handleError(async (req, res) => {
-  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 { from_date, to_date } = req.query
+  let query = {
+    createdAt: {
+      $gte: from_date ? moment(from_date).startOf('day').toDate() : moment().startOf('month').toDate(),
+      $lte: to_date ? moment(to_date).endOf('day').toDate() : moment().endOf('month').toDate(),
     }
   }
   const log = await logModel.find(query).populate('user').sort({ createdAt: -1 })
 
   return response.success(res, {
-    data: log,
+    data: log
   })
 })

controller/v2/auth.controller.js

@@ -109,13 +109,13 @@ exports.loginToPT = [
 
     try {
       const userResponse = await pddiktiService.login({username: user.email, password})
-      if (userResponse.code !== 200) {
+      if (userResponse.code && userResponse.code !== 200) {
         return response.error(res, {
           code: 401,
-          message: userResponse.message
+          message: userResponse.message,
         })
       }
-      dataLembaga = await pddiktiService.getPembina({search: lembaga_id})
+      dataLembaga = await pddiktiService.getPT(lembaga_id)
     } catch (e) {
       return response.error(res, {
         code: e.response.status,

services/v2/pddikti.service.js

@@ -33,10 +33,11 @@ exports.getPT = (id, query = {}) => {
 
 /**
  *
+ * @param id
  * @param query
  * @returns {Promise<*>}
  */
-exports.getPembina = (query = {}) => {
+exports.getPembina = (id, query = {}) => {
   let token
   let url = 'https://api.kemdikbud.go.id:8243/pddikti/1.2/lembaga-non-sp'
   if (coba.decrypt(process.env.CXQSB) === PRODUCTION) {