diff --git a/src/libs/routes/idhm.js b/src/libs/routes/idhm.js index 3181e67667e7e4ded45c0561b4795e6ce3bc5998..7be7a1dda53bfe4784b34264ee2f20cb0e942519 100644 --- a/src/libs/routes/idhm.js +++ b/src/libs/routes/idhm.js @@ -138,8 +138,7 @@ idhmApp.get('/', rqf.parse(), (req, res, next) => { message: 'Wrong/No filter specified' }); } - if ("state" in req.filter) { - console.log("BBBBB"); + if ("state" in req.filter && !("city" in req.filter)) { req.sql.from('adh_idh_uf') .field('adh_idh_uf.idhm', 'total') .field('adh_idh_uf.ano_censo', 'year') @@ -147,34 +146,16 @@ idhmApp.get('/', rqf.parse(), (req, res, next) => { .group('adh_idh_uf.idhm') .group('adh_idh_uf.ano_censo') .group('adh_idh_uf.estado_id') - } else if ("state" in req.dims) { - console.log("AAAAAAAAA"); + } else if ("city" in req.filter) { req.sql.from('adh_idh') .field('adh_idh.idhm', 'total') .field('adh_idh.ano_censo', 'year') .field('adh_idh.municipio_id', 'city_id') - .field('adh_idh.estado_id', 'state_id') + .field('adh_idh.estado_id', 'city_id') .group('adh_idh.idhm') .group('adh_idh.ano_censo') .group('adh_idh.municipio_id') .group('adh_idh.estado_id') - } else if ("city" in req.filter) { - req.sql.from('adh_idh') - .field('adh_idh.idhm', 'total') - .field('adh_idh.ano_censo', 'year') - .field('adh_idh.municipio_id', 'city_id') - .group('adh_idh.idhm') - .group('adh_idh.ano_censo') - .group('adh_idh.municipio_id') - } else if ("city" in req.dims) { - req.sql.from('adh_idh') - .field('adh_idh.idhm', 'total') - .field('adh_idh.ano_censo', 'year') - .field('adh_idh.municipio_id', 'city_id') - .group('adh_idh.idhm') - .group('adh_idh.ano_censo') - .group('adh_idh.municipio_id') - .group('adh_idh.estado_id') } else { next({ status: 400,