merge solved

Author: mutazen

api/controllers/action.controllers.js

@@ -0,0 +1,54 @@
+const { incidencesModel } = require('../models/incidences.model')
+
+exports.createAction = (req, res) => {
+  incidencesModel
+    .findById(req.params.incidenceId)
+    .then(incidence => {
+      incidence.actions.push({ technicianId: req.params.technicianId, ...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 ' })
+    })
+}
+
+exports.getAction = (req, res) => {
+  incidencesModel
+    .findById(req.params.incidenceId)
+    .then(incidence => {
+      const action = incidence.actions.id(req.params.actionId)
+      console.log(action)
+      res.status(200).json(action)
+    })
+    .catch(err => {
+      console.log(err)
+      res.status(500).json({ msg: 'Error ' })
+    })
+}

api/controllers/employees.controller.js

@@ -94,7 +94,6 @@ exports.deleteEmployee = (req, res) => {
   employeeModel
     .findOneAndRemove({ email: req.body.email })
     .then(user => {
-      console.log('hola')
       res.status(200).json({ msg: `The user with email: ${user.email}, has been deleted!` })
     })
     .catch(err => {

api/models/action.model.js

@@ -0,0 +1,27 @@
+const mongoose = require('mongoose')
+
+const actionSchema = new mongoose.Schema({
+  done: {
+    type: String,
+    required: true
+  },
+  status: {
+    type: String,
+    required: [true, 'Status is required']
+  },
+  startDate: {
+    type: Date,
+    required: [true, 'Start date is required']
+  },
+  finishDate: {
+    type: Date,
+    required: [true, 'Finish date is required']
+  },
+  technicianId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'employee',
+    required: true
+  }
+})
+
+exports.actionSchema = actionSchema

api/models/incidences.model.js

@@ -0,0 +1,44 @@
+const mongoose = require('mongoose')
+const { incidenceCategoriesSchema } = require('./incidencesCategories.model')
+const { actionSchema } = require('./action.model')
+//const clientSchema = require('./clients.model')
+
+const incidenceSchema = new mongoose.Schema({
+  subject: {
+    type: String
+  },
+  description: {
+    type: String
+  },
+  status: {
+    type: String,
+    required: true
+  },
+  priority: {
+    type: String,
+    required: true
+  },
+  attachment: {
+    type: String
+  },
+  startDate: {
+    type: Date,
+    required: true
+  },
+  finishDate: {
+    type: Date,
+    required: true
+  },
+  employees: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'employee',
+    required: true
+  },
+  incidencesCategory: [incidenceCategoriesSchema],
+  actions: [actionSchema]
+  //client: [clientSchema]
+})
+
+const incidencesModel = mongoose.model('incidences', incidenceSchema)
+
+exports.incidencesModel = incidencesModel

api/models/incidencesCategories.model.js

@@ -8,6 +8,4 @@ const incidenceCategoriesSchema = new mongoose.Schema({
   }
 })
 
-const incidenceCategoriesModel = mongoose.model('incidenceCategories', incidenceCategoriesSchema)
-
-exports.incidenceCategoriesModel = incidenceCategoriesModel
+exports.incidenceCategoriesSchema = incidenceCategoriesSchema

api/routes/action.router.js

@@ -0,0 +1,13 @@
+const actionRouter = require('express').Router()
+
+const {
+  createAction,
+  updateAction,
+  getAction
+} = require('../controllers/action.controllers')
+
+actionRouter.get('/incidences/:incidenceId/:actionId', getAction)
+actionRouter.post('/incidences/:technicianId/:incidenceId', createAction)
+actionRouter.put('/incidences/:incidenceId/:actionId', updateAction)
+
+exports.actionRouter = actionRouter

api/routes/index.js

@@ -4,9 +4,12 @@ const { employeesRouter } = require('./employees.router')
 const { authRouter } = require('./auth.router')
 const { incidenceCategoriesRouter } = require('./incidenceCategories.router')
 
+const { actionRouter } = require('./action.router')
+
 router
   .use('/employees', employeesRouter)
   .use('/auth', authRouter)
   .use('/incidenceCategories', incidenceCategoriesRouter)
+  .use('/action', actionRouter)
 
 exports.router = router