Skip to content
Snippets Groups Projects
Commit 72b70404 authored by Fernando Erd's avatar Fernando Erd :ok_hand:
Browse files

Fix - Route test idhm and idhmr

parent 6b9da0c9
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!60IDHMR and IDHM routes
Pipeline #
...@@ -132,50 +132,55 @@ rqf.addField({ ...@@ -132,50 +132,55 @@ rqf.addField({
idhmApp.get('/', rqf.parse(), (req, res, next) => { idhmApp.get('/', rqf.parse(), (req, res, next) => {
log.debug(req.sql.toParam()); log.debug(req.sql.toParam());
if((Object.keys(req.filter).length === 0) && (Object.keys(req.dims).length === 0)) { if((Object.keys(req.filter).length === 0) && (Object.keys(req.dims).length === 0)) {
res.status(400); res.status(400);
next({ next({
status: 400, status: 400,
message: 'Wrong/No filter specified' message: 'Wrong/No filter specified'
}); });
} }
if ("state" in req.filter) { if ("state" in req.filter) {
console.log("BBBBB"); console.log("BBBBB");
req.sql.from('adh_idh_uf') req.sql.from('adh_idh_uf')
.field('adh_idh_uf.idhm', 'total') .field('adh_idh_uf.idhm', 'total')
.field('adh_idh_uf.ano_censo', 'year') .field('adh_idh_uf.ano_censo', 'year')
.field('adh_idh_uf.estado_id', 'state_id') .field('adh_idh_uf.estado_id', 'state_id')
.group('adh_idh_uf.idhm') .group('adh_idh_uf.idhm')
.group('adh_idh_uf.ano_censo') .group('adh_idh_uf.ano_censo')
.group('adh_idh_uf.estado_id') .group('adh_idh_uf.estado_id')
} else if ("state" in req.dims) { } else if ("state" in req.dims) {
console.log("AAAAAAAAA"); console.log("AAAAAAAAA");
req.sql.from('adh_idh') req.sql.from('adh_idh')
.field('adh_idh.idhm', 'total') .field('adh_idh.idhm', 'total')
.field('adh_idh.ano_censo', 'year') .field('adh_idh.ano_censo', 'year')
.field('adh_idh.municipio_id', 'city_id') .field('adh_idh.municipio_id', 'city_id')
.field('adh_idh.estado_id', 'state_id') .field('adh_idh.estado_id', 'state_id')
.group('adh_idh.idhm') .group('adh_idh.idhm')
.group('adh_idh.ano_censo') .group('adh_idh.ano_censo')
.group('adh_idh.municipio_id') .group('adh_idh.municipio_id')
.group('adh_idh.estado_id') .group('adh_idh.estado_id')
} else if ("city" in req.filter) { } else if ("city" in req.filter) {
req.sql.from('adh_idh') req.sql.from('adh_idh')
.field('adh_idh.idhm', 'total') .field('adh_idh.idhm', 'total')
.field('adh_idh.ano_censo', 'year') .field('adh_idh.ano_censo', 'year')
.field('adh_idh.municipio_id', 'city_id') .field('adh_idh.municipio_id', 'city_id')
.group('adh_idh.idhm') .group('adh_idh.idhm')
.group('adh_idh.ano_censo') .group('adh_idh.ano_censo')
.group('adh_idh.municipio_id') .group('adh_idh.municipio_id')
} else if ("city" in req.dims) { } else if ("city" in req.dims) {
req.sql.from('adh_idh') req.sql.from('adh_idh')
.field('adh_idh.idhm', 'total') .field('adh_idh.idhm', 'total')
.field('adh_idh.ano_censo', 'year') .field('adh_idh.ano_censo', 'year')
.field('adh_idh.municipio_id', 'city_id') .field('adh_idh.municipio_id', 'city_id')
.group('adh_idh.idhm') .group('adh_idh.idhm')
.group('adh_idh.ano_censo') .group('adh_idh.ano_censo')
.group('adh_idh.municipio_id') .group('adh_idh.municipio_id')
.group('adh_idh.estado_id') .group('adh_idh.estado_id')
} } else {
next({
status: 400,
message: 'Wrong/No filter specified'
});
}
next(); next();
}, rqf.build(),query, response('idhm')); }, rqf.build(),query, response('idhm'));
......
...@@ -108,23 +108,29 @@ rqf.addField({ ...@@ -108,23 +108,29 @@ rqf.addField({
idhmrApp.get('/', rqf.parse(), (req, res, next) => { idhmrApp.get('/', rqf.parse(), (req, res, next) => {
log.debug(req.sql.toParam()); log.debug(req.sql.toParam());
if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0 ) { if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0 ) {
res.status(400); res.status(400);
next({ next({
status: 400, status: 400,
message: 'Wrong/No filter specified' message: 'Wrong/No filter specified'
}); });
} }
if ("state" in req.filter) { if ("state" in req.filter) {
req.sql.from('adh_idh_uf') req.sql.from('adh_idh_uf')
.field('adh_idh_uf.idhm_r', 'total') .field('adh_idh_uf.idhm_r', 'total')
.field('adh_idh_uf.ano_censo', 'year') .field('adh_idh_uf.ano_censo', 'year')
.field('adh_idh_uf.estado_id', 'state_id'); .field('adh_idh_uf.estado_id', 'state_id');
} else if ("city" in req.filter) { } else if ("city" in req.filter) {
req.sql.from('adh_idh') req.sql.from('adh_idh')
.field('adh_idh.idhm_r', 'total') .field('adh_idh.idhm_r', 'total')
.field('adh_idh.ano_censo', 'year') .field('adh_idh.ano_censo', 'year')
.field('adh_idh.municipio_id', 'city_id'); .field('adh_idh.municipio_id', 'city_id');
} } else {
next({
status: 400,
message: 'Wrong/No filter specified'
});
}
next(); next();
}, rqf.build(),query, response('idhmr')); }, rqf.build(),query, response('idhmr'));
......
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