diff --git a/src/libs/routes/idhml.js b/src/libs/routes/idhml.js index cddd57ad30ca6b24bbfac03cf763d7c72616d342..be1ee7a3b7a0b00b7d914d0a9fe1d480034beae7 100644 --- a/src/libs/routes/idhml.js +++ b/src/libs/routes/idhml.js @@ -122,32 +122,25 @@ rqf.addField({ }); idhmlApp.get('/', rqf.parse(), (req, res, next) => { - if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0) { - res.status(400); - next({ - status: 400, - message: 'Wrong/No filter specified' - }); - } - if (!("state" in req.filter) && !("city" in req.filter)) { - next({ - status: 400, - message: 'Wrong/No filter specified' - }); - } - if ("city" in req.filter) { + + if (("city" in req.dims) || ("city" in req.filter)) { req.sql.from('adh_idh') .field('adh_idh.idhm_l', 'total') .field('adh_idh.ano_censo', 'year') - .field('adh_idh.municipio_id', 'city_id'); + .field('adh_idh.municipio_id', 'city_id') + .group('adh_idh.idhm_l') + .group('adh_idh.ano_censo') + .group('adh_idh.municipio_id'); } else { - // console.log("sim"); req.sql.from('adh_idh_uf') .field('adh_idh_uf.idhm_l', 'total') .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_l') + .group('adh_idh_uf.ano_censo') + .group('adh_idh_uf.estado_id'); } next(); -}, rqf.build(), query, response('idhml')); +}, rqf.build(), query, id2str.transform(), response('idhme')); module.exports = idhmlApp;