diff --git a/src/libs/routes/idhmr.js b/src/libs/routes/idhmr.js index 61aa486c9159f89796dde811174f4f2a5fc12c50..64c805ce0cf3e9fef1fddb2baa83b1ee75dcbc40 100644 --- a/src/libs/routes/idhmr.js +++ b/src/libs/routes/idhmr.js @@ -23,6 +23,22 @@ idhmrApp.get('/year_range', (req, res, next) => { .field('MIN(adh_idh.ano_censo)', 'start_year') .field('MAX(adh_idh.ano_censo)', 'end_year'); next(); +}, query, (req, res, next) => { + req.sql.from('adh_idh_uf') + .field('MIN(adh_idh_uf.ano_censo)', 'start_year') + .field('MAX(adh_idh_uf.ano_censo)', 'end_year'); + req.old_result = req.result; + next(); +}, query, (req, res, next) => { + // console.log(req.old_result[0].start_year); + // console.log(req.result[0].start_year); + if (req.old_result[0].start_year < req.result[0].start_year) { + req.result[0].start_year = req.old_result[0].start_year; + } + if (req.old_result[0].end_year > req.result[0].end_year) { + req.result[0].end_year = req.old_result[0].old_result; + } + next(); }, query, response('range')); rqf.addField({ @@ -65,26 +81,28 @@ rqf.addField({ foreign: 'estado_id', foreignTable: 'adh_idh_uf' } - }).addValue({ - name: 'min_year', - table: 'adh_idh', - tableField: 'ano_censo', - resultField: 'year', - where: { - relation: '>=', - type: 'integer', - field: 'ano_censo' - } - }).addValue({ - name: 'max_year', - table: 'adh_idh', - tableField: 'ano_censo', - resultField: 'year', - where: { - relation: '<=', - type: 'integer', - field: 'ano_censo' - } +}).addValue({ + name: 'min_year', + table: '@', + tableField: 'ano_censo', + resultField: 'year', + where: { + relation: '>=', + type: 'integer', + table: '@', + field: 'ano_censo' + } +}).addValue({ + name: 'max_year', + table: '@', + tableField: 'ano_censo', + resultField: 'year', + where: { + relation: '<=', + type: 'integer', + table: '@', + field: 'ano_censo' + } }); idhmrApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {