From d4647a7f90cea454cec9991b07c775fffaf88c5e Mon Sep 17 00:00:00 2001 From: Rudolf Copi Eckelberg <rce16@inf.ufpr.br> Date: Mon, 17 Oct 2016 15:48:56 -0200 Subject: [PATCH] Some extra methods previously ignored for simulations --- src/libs/models/simulation.js | 2 +- src/libs/routes/api.js | 2 +- src/libs/routes/simulation.js | 36 ++++++++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/libs/models/simulation.js b/src/libs/models/simulation.js index aa6589d1..6ba85b49 100644 --- a/src/libs/models/simulation.js +++ b/src/libs/models/simulation.js @@ -15,7 +15,7 @@ let SimulationSchema = new Schema({ required: true, }, location: Object, - time: Number, + time: Date, failure_rate: Array, goals_care: Array, goals_inclusion: Array, diff --git a/src/libs/routes/api.js b/src/libs/routes/api.js index 4fc68cf2..2c259bab 100644 --- a/src/libs/routes/api.js +++ b/src/libs/routes/api.js @@ -6,7 +6,7 @@ const libs = `${process.cwd()}/libs`; const config = require(`${libs}/config`); -const cache = require('apicache').options({ debug: config.get('debug') }).middleware; +const cache = require('apicache').options({ debug: config.debug }).middleware; const enrollment = require('./enrollment'); diff --git a/src/libs/routes/simulation.js b/src/libs/routes/simulation.js index ce1a2ff0..b1599750 100644 --- a/src/libs/routes/simulation.js +++ b/src/libs/routes/simulation.js @@ -16,7 +16,14 @@ const response = require(`${libs}/middlewares/response`); const Simulation = require(`${libs}/models/simulation`); simulationApp.get('/', (req, res) => { - res.send({ success: true, msg: 'controller working' }); + let out = { success: true, msg: 'controller working' }; + out.result = new Array() + Simulation.find({}, function(err, sims) { + sims.forEach((sim) => { + out.result.push(sim); + }); + res.send(out); + }); }); @@ -30,8 +37,10 @@ simulationApp.post('/', (req, res, next) => { next(); } }, (req, res) => { + let currentdate = new Date(); let newSimulation = new Simulation({ name: req.body.name, + time: currentdate.getDate(), }); newSimulation.save((err) => { if (err) { @@ -113,4 +122,29 @@ simulationApp.post('/:id', (req, res, next) => { }); }); +simulationApp.delete('/:id', (req, res, next) => { + let simulation = Simulation.findById(req.params.id, (err, simulation) => { + if (err) { + res.send({ success: false, msg: err }); + } else { + if (!simulation) { + res.send({ success: false, msg: 'Entry not found' }); + } else { + next(); + } + } + }); +}, (req, res) => { + Simulation.remove({"_id": req.params.id}, (err) => { + if (err) { + res.send({ success: false, msg: err }); + } else { + res.send({ + success: true, + msg: 'sim removed', + }); + } + }); +}); + module.exports = simulationApp; -- GitLab