diff --git a/src/libs/routes_v1/simulation.js b/src/libs/routes_v1/simulation.js index ea9921d36c89049887b0d0202951862595725031..11ff69d33650618114c8deb3f5e9698c69983dfe 100644 --- a/src/libs/routes_v1/simulation.js +++ b/src/libs/routes_v1/simulation.js @@ -38,37 +38,45 @@ simulationApp.get('/pqr', async (req, res) => { }); simulationApp.put('/pqr', passport.authenticate('bearer', { session: false }), async (req, res, next) => { - let user = req.user.toObject(); - let pqr = await PQR.findOne({ attributes: ['content'] }).catch(function (err) { + let user = req.user; + let pqr = await PQR.findOne().catch(function (err) { if (err) { log.error(err); return next({ err }); } }); + res.json(pqr); if (!user.admin) { log.info(`Usuário ${user.email} tentou alterar o PQR, mas não tem privilégio`); res.statusCode = 401; return next({ err: { msg: 'Unauthorized' } }); } - pqr.content = req.body.content || pqr.content; - pqr.save().catch(function (err) { - if (err) { - log.error(err); - return next({ err }); - } - }); + + if(pqr){ + let _content = req.body.content || pqr.content; + pqr.content = _content; + await pqr.save({fields:['content']}).catch(function (err) { + if (err) { + log.error(err); + return next({ err }); + } + });} + res.json({ msg: 'PQR updated' }) }); simulationApp.get('/', passport.authenticate('bearer', { session: false }), async (req, res) => { - let user = req.user.toObject(); + let user = req.user; let simulations = await Simulation.findAll({ where: { user_id: user.id } }, { attributes: ['user_id', 'name', 'created_at', 'updated_at'] }).catch(function (err) { if (err) { log.error(err); return next({ err }); } }) + if (!simulations){ + res.json("Simulations not found"); + } res.json(simulations); // Simulation.find({userId: user._id}, (err, simulations) => { @@ -82,7 +90,7 @@ simulationApp.get('/', passport.authenticate('bearer', { session: false }), asyn }); simulationApp.post('/', passport.authenticate('bearer', { session: false }), async (req, res, next) => { - let user = req.user.toObject(); + let user = req.user; let simulation = await Simulation.create({ user_id: user.id, @@ -101,9 +109,9 @@ simulationApp.post('/', passport.authenticate('bearer', { session: false }), asy }) simulationApp.get('/:id', passport.authenticate('bearer', { session: false }), async (req, res) => { - let user = req.user.toObject(); + let user = req.user; - let simulation = await Simulation.findOne({where:{id: req.params.id, userId: user._id }}).catch(function (err) { + let simulation = await Simulation.findOne({where:{id: req.params.id, user_id: user.id }}).catch(function (err) { if (err) { log.error(err); return next({ err }); @@ -114,7 +122,7 @@ simulationApp.get('/:id', passport.authenticate('bearer', { session: false }), a }); simulationApp.put('/:id', passport.authenticate('bearer', { session: false }), async (req, res, next) => { - let user = req.user.toObject(); + let user = req.user; let simulation = await Simulation.findOne({ where: { id: req.params.id, user_id: user.id } }).catch(function (err) { if (err) { @@ -130,19 +138,19 @@ simulationApp.put('/:id', passport.authenticate('bearer', { session: false }), a simulation.content = req.body.content || simulation.content; simulation.name = req.body.name || simulation.name; - simulation.updated_at = Date.now(); - simulation.save().catch(function (err) { + simulation.updated_at = new Date(); + await simulation.save({fields:['content','name','updated_at']}).catch(function (err) { if (err) { log.error(err); return next({ err }); } }); - res.json(simulation); + res.json({msg: 'Simulation updated'}); }); simulationApp.delete('/:id', passport.authenticate('bearer', { session: false }), async (req, res, next) => { - let user = req.user.toObject(); - await Simulation.destroy({ where: { "id": req.params.id, "user_id": user._id } }).catch(function (err) { + let user = req.user; + await Simulation.destroy({where: { "id": req.params.id, "user_id": user.id } }).catch(function (err) { if (err) { log.error(err); return next({ err });