All done

Author: Juan Pablo

api/controllers/action.controllers.js

@@ -1,11 +1,10 @@
 const { incidencesModel } = require('../models/incidences.model')
 
-exports.listUserIncidences = (req, res) => {
+exports.listUserIncidence = (req, res) => {
   incidencesModel
-    .find({ 'client.email': req.params.clientEmail })
+    .findById(req.params.id)
     .then(incidences => {
-
-      if (incidences[0].client.password === req.params.clientPassword) {
+      if (incidences[0].client.password === req.body.client.password) {
         console.log(incidences)
         const incidencesArray = []
         incidences.forEach((incidence, index) => {

api/controllers/clients.controller.js

@@ -13,7 +13,7 @@ exports.createIncidence = (req, res) => {
       priority: ' ',
       startDate: day,
       finishDate: finishD,
-      incidenceCategory: req.params.incidenceCategory,
+      incidenceCategory: req.body.incidenceCategory,
       client: {
         firstName: req.body.client.firstName,
         lastName: req.body.client.lastName,
@@ -32,6 +32,20 @@ exports.createIncidence = (req, res) => {
     })
 }
 
+exports.getAllIncidence = (req, res) => {
+  incidencesModel
+    .find()
+    .populate('incidenceCategory')
+    .populate('Technician')
+    .then(incidence => {
+      res.status(200).json(incidence)
+    })
+    .catch(err => {
+      console.log(err)
+      res.status(500).json({ msg: 'Error' })
+    })
+}
+
 exports.getIncidence = (req, res) => {
   incidencesModel
     .findById(req.params.incidenceID)
@@ -90,3 +104,43 @@ exports.deleteIncidence = (req, res) => {
       res.status(500).json({ msg: 'Error' })
     })
 }
+
+exports.createAction = (req, res) => {
+  const day = new Date()
+  const finishD = new Date(0)
+  incidencesModel
+    .findById(req.params.incidenceId)
+    .then(incidence => {
+      console.log(incidence)
+      incidence.actions.push({ technicianId: req.params.technicianId, startDate: day, finishDate: finishD, ...req.body })
+      incidence.save(err => {
+        if (err) res.status(500).send(err)
+        res.status(200).json(incidence)
+      })
+    })
+    .catch(err => {
+      console.log(err)
+      res.status(500).json({ msg: 'Error ' })
+    })
+}
+
+exports.updateAction = (req, res) => {
+  incidencesModel
+    .findById(req.params.incidenceId)
+    .then(incidence => {
+      const action = incidence.actions.id(req.params.actionId)
+      incidence.actions.id(req.params.actionId).done = req.body.done ?? action.done
+      incidence.actions.id(req.params.actionId).status = req.body.status ?? action.status
+      incidence.actions.id(req.params.actionId).startDate = action.startDate
+      incidence.actions.id(req.params.actionId).finishDate = action.finishDate
+      incidence.actions.id(req.params.actionId).technicianId = action.technicianId
+      incidence.save(err => {
+        if (err) res.status(500).send(err)
+        res.status(200).json(incidence)
+      })
+    })
+    .catch(err => {
+      console.log(err)
+      res.status(500).json({ msg: 'Error ' })
+    })
+}

api/controllers/incidences.controller.js

@@ -20,8 +20,7 @@ const actionSchema = new mongoose.Schema({
   },
   technicianId: {
     type: mongoose.Schema.Types.ObjectId,
-    ref: 'employee',
-    required: true
+    ref: 'employee'
   }
 })
 

api/models/action.model.js

@@ -6,7 +6,7 @@ const {
   whoami
 } = require('../controllers/auth.controller')
 
-authRouter.get('/whoami', checkAuth, checkManager, whoami)
+authRouter.get('/whoami', checkAuth, whoami)
 
 authRouter.post('/login', login)
 

api/routes/action.router.js

@@ -1,9 +1,9 @@
 const clientsRouter = require('express').Router()
 
 const {
-  listUserIncidences
+  listUserIncidence
 } = require('../controllers/clients.controller')
 
-clientsRouter.get('/clientEmail/:clientEmail/clientPassword/:clientPassword', listUserIncidences)
+clientsRouter.get('/incidenceId/:id/', listUserIncidence)
 
 exports.clientsRouter = clientsRouter

api/routes/auth.router.js

@@ -8,7 +8,7 @@ const {
   getAllEmployees
 } = require('../controllers/employees.controller')
 
-employeesRouter.post('/', checkAuth, checkManager, addEmployee)
+employeesRouter.post('/', addEmployee)
 employeesRouter.put('/:idEmployee', checkAuth, checkManager, updateEmployee)
 employeesRouter.get('/', checkAuth, checkManager, getAllEmployees)
 employeesRouter.delete('/', checkAuth, checkManager, deleteEmployee)

api/routes/clients.router.js

@@ -1,16 +1,23 @@
 const incidencesRouter = require('express').Router()
-const { checkAuth } = require('../../utils')
+const { checkAuth, checkManager, checkCustomerServiceOrManager, checkTechnicianOrManager } = require('../../utils')
 
 const {
-createIncidence,
-getIncidence,
-updateIncidence,
-deleteIncidence
+  createIncidence,
+  getIncidence,
+  getAllIncidences,
+  updateIncidence,
+  deleteIncidence,
+  createAction,
+  updateAction,
+  getAction
 } = require('../controllers/incidences.controller')
 
+incidencesRouter.get('/', checkAuth, checkManager, getIncidence)
 incidencesRouter.get('/:incidenceID', getIncidence)
-incidencesRouter.post('/:customerServiceId/:incidenceCategory', createIncidence)
-incidencesRouter.put('/:incidenceID', checkAuth, updateIncidence)
-incidencesRouter.delete('/incidenceID/:incidenceID', deleteIncidence)
+incidencesRouter.post('/', checkAuth, checkCustomerServiceOrManager, createIncidence)
+incidencesRouter.post('/:incidenceId/technician/:technicianId', checkAuth, checkTechnicianOrManager, createAction)
+incidencesRouter.put('/:incidenceID', checkAuth, checkTechnicianOrManager, updateIncidence)
+incidencesRouter.put('/:incidenceId/action/:actionId', checkAuth, checkTechnicianOrManager, updateAction)
+incidencesRouter.delete('/:incidenceID', checkAuth, checkManager, deleteIncidence)
 
 exports.incidencesRouter = incidencesRouter

api/routes/employees.router.js

@@ -3,8 +3,6 @@ const router = require('express').Router()
 const { employeesRouter } = require('./employees.router')
 const { authRouter } = require('./auth.router')
 const { incidenceCategoriesRouter } = require('./incidenceCategories.router')
-
-const { actionRouter } = require('./action.router')
 const { clientsRouter } = require('./clients.router')
 const { incidencesRouter } = require('./incidences.router')
 
@@ -13,7 +11,6 @@ router
   .use('/employees', employeesRouter)
   .use('/auth', authRouter)
   .use('/incidenceCategories', incidenceCategoriesRouter)
-  .use('/action', actionRouter)
   .use('/client', clientsRouter)
   .use('/incidences', incidencesRouter)
 

api/routes/incidences.router.js

@@ -4,11 +4,8 @@ const { runInNewContext } = require('vm')
 const { employeeModel } = require('../api/models/employees.model')
 
 exports.checkAuth = (req, res, next) => {
-
   jwt.verify(req.headers.token, process.env.SECRET, (err, token) => {
-
     if (err) { res.status(403).json({ error: 'Token not valid' }) }
-
     employeeModel
       .findOne({ email: token.email })
       .then(user => {
@@ -87,6 +84,19 @@ exports.checkCustomerServiceOrManagerOrTechnician = (req, res, next) => {
     })
 }
 
+exports.checkTechnicianOrManager = (req, res, next) => {
+  employeeModel
+    .findOne({ email: req.body.token.email })
+    .then(user => {
+      if (user.rol === 'Technician' || user.rol === 'Manager') {
+        res.locals.user = user
+        next()
+      } else {
+        res.status(500).json({ err: 'Token not valid' })
+      }
+    })
+}
+
 exports.isValidEmail = (email) => {
   const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
   return re.test(String(email).toLowerCase())