From 12651034de00229f458766fe98b0589c64a5ea75 Mon Sep 17 00:00:00 2001 From: Lewis <lgtg20@inf.ufpr.br> Date: Thu, 5 Sep 2024 16:02:43 -0300 Subject: [PATCH] Refactor federativeEntity route to include state and region filters --- src/libs/routes_v1/federativeEntity.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libs/routes_v1/federativeEntity.js b/src/libs/routes_v1/federativeEntity.js index fb200e65..4a356247 100644 --- a/src/libs/routes_v1/federativeEntity.js +++ b/src/libs/routes_v1/federativeEntity.js @@ -429,8 +429,6 @@ rqf.addField({ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { - console.log(req.query); - if (req.query.dims && req.query.dims.includes('education_level_mod_entity_seg')) { req.sql.from('docentes_sinopse') @@ -559,7 +557,7 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .order('docentes_sinopse.ano_censo') .where('docentes_sinopse.cod_reg = 0'); } - else if (req.query.dims && req.query.dims.includes('state')) { + else if ((req.query.dims && req.query.dims.includes('state')) || (req.query.filter && req.query.filter.includes('state'))) { req.sql.from('docentes_sinopse') .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total') .field('docentes_sinopse.ano_censo', 'year') @@ -567,7 +565,7 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .order('docentes_sinopse.ano_censo') .where('docentes_sinopse.cod_mun = 0'); } - else if (req.query.dims && req.query.dims.includes('region')) { + else if ((req.query.dims && req.query.dims.includes('region')) || (req.query.filter && req.query.filter.includes('region'))) { req.sql.from('docentes_sinopse') .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total') .field('docentes_sinopse.ano_censo', 'year') -- GitLab