Skip to content
Snippets Groups Projects
Commit 37cedea0 authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Merge branch 'development' into db_simcaq_dev2

parents b733e01a be9f0813
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!34Db simcaq dev2
...@@ -10,7 +10,7 @@ function query(req, res, next) { ...@@ -10,7 +10,7 @@ function query(req, res, next) {
log.debug(result); log.debug(result);
req.result = result; req.result = result;
if (result.length === 0) { if (result.length === 0) {
next({status: 404, message: 'Not Found'}); next({status: 404, message: 'No results found in database'});
} }
next(); next();
}, (error) => { }, (error) => {
......
...@@ -14,6 +14,21 @@ const response = require(`${libs}/middlewares/response`); ...@@ -14,6 +14,21 @@ const response = require(`${libs}/middlewares/response`);
const Simulation = require(`${libs}/models/simulation`); const Simulation = require(`${libs}/models/simulation`);
simulationApp.get('/time', (req, res, next) => {
const maxTime = parseInt(req.query.max_time, 10);
log.debug('maxTime: ', maxTime);
if(isNaN(maxTime)) {
res.status(400);
next({
status: 400,
message: 'Invalid value for mandatory parameter max_time'
});
}
res.json({
result: Array.apply(null, {length: maxTime}).map(Number.call, Number).map((i)=>i+1)
});
});
simulationApp.get('/', (req, res) => { simulationApp.get('/', (req, res) => {
let out = { success: true, msg: 'controller working' }; let out = { success: true, msg: 'controller working' };
out.result = new Array() out.result = new Array()
......
...@@ -84,7 +84,7 @@ describe('Query middleware', () => { ...@@ -84,7 +84,7 @@ describe('Query middleware', () => {
error.should.have.property('status'); error.should.have.property('status');
error.status.should.be.equal(404); error.status.should.be.equal(404);
error.should.have.property('message'); error.should.have.property('message');
error.message.should.be.equal('Not Found'); error.message.should.be.equal('No results found in database');
done(); done();
}); });
}); });
......
...@@ -405,4 +405,29 @@ describe('Requires a simulation', () => { ...@@ -405,4 +405,29 @@ describe('Requires a simulation', () => {
done(); done();
}); });
}); });
it('should returns an array in simulation/time', (done) => {
let max_time = 10;
chai.request(server)
.get(`/api/v1/simulation/time?max_time=${max_time}`)
.end((err, res) => {
res.should.have.status(200);
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.array;
done();
});
});
it('should return an error when no max_time is specified in simulation/time', (done) => {
chai.request(server)
.get(`/api/v1/simulation/time`)
.end((err, res) => {
res.should.have.status(400);
res.should.be.json;
res.body.should.have.property('error');
res.body.error.should.equal('Invalid value for mandatory parameter max_time');
done();
});
});
}); });
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment