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

Query middleware throws error on empty result

parent 080d4598
No related branches found
No related tags found
1 merge request!116Release v1.0.0
Pipeline #
...@@ -74,11 +74,11 @@ gulp.task('pre-test', () => { ...@@ -74,11 +74,11 @@ gulp.task('pre-test', () => {
gulp.task('test', ['pre-test'], () => { gulp.task('test', ['pre-test'], () => {
process.chdir('build'); process.chdir('build');
gulp.src('test/test.js', {read: false}) gulp.src('test/test.js', {read: false})
.pipe(mocha()) .pipe(mocha({timeout: 15000}))
.pipe(istanbul.writeReports()) .pipe(istanbul.writeReports())
.pipe(istanbul.enforceThresholds({ .pipe(istanbul.enforceThresholds({
thresholds: { thresholds: {
global: 80 global: 80
} }
})) }))
.on('error', () => { .on('error', () => {
......
...@@ -41,7 +41,7 @@ app.use('/api/v1', api); ...@@ -41,7 +41,7 @@ app.use('/api/v1', api);
// Catch 404 and forward to error handler // Catch 404 and forward to error handler
app.use((req, res, next) => { app.use((req, res, next) => {
res.status(404); res.status(404);
log.debug('%s %d %s', req.method, res.statusCode, req.url); log.error('%s %d %s', req.method, res.statusCode, req.url);
res.json({ error: 'Not found' }).end(); res.json({ error: 'Not found' }).end();
}); });
......
...@@ -9,6 +9,7 @@ function query(req, res, next) { ...@@ -9,6 +9,7 @@ function query(req, res, next) {
execQuery(sql.text, sql.values).then((result) => { execQuery(sql.text, sql.values).then((result) => {
log.debug(result); log.debug(result);
req.result = result; req.result = result;
if(result.length === 0) next({status: 404, message: 'Not Found'});
next(); next();
}, (error) => { }, (error) => {
next(error); next(error);
......
...@@ -209,11 +209,6 @@ enrollmentApp.get('/', (req, res, next) => { ...@@ -209,11 +209,6 @@ enrollmentApp.get('/', (req, res, next) => {
.group('turmas.ano_censo') .group('turmas.ano_censo')
.order('turmas.ano_censo'); .order('turmas.ano_censo');
next(); next();
}, query, (req, res, next) => { }, query, response('enrollment'));
if(req.result.length === 0) {
req.result.push({total: 0});
}
next();
}, response('enrollment'));
module.exports = enrollmentApp; module.exports = enrollmentApp;
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