diff --git a/src/libs/routes_v1/studentsReceivingAidTax.js b/src/libs/routes_v1/studentsReceivingAidTax.js index c4509cf84057b5243e9e93f2ae7ccfc992e00a47..16547bfda95c5dee75a9aa262d35a3a003469bed 100644 --- a/src/libs/routes_v1/studentsReceivingAidTax.js +++ b/src/libs/routes_v1/studentsReceivingAidTax.js @@ -242,7 +242,7 @@ studentsReceivingAidTaxApp.get('/state', (req, res, next) => { next(); }, response('state')); -studentsReceivingAidTaxApp.get('/age_range', (req, res, next) => { +studentsReceivingAidTaxApp.get('/age_range_all', (req, res, next) => { req.result = [] for (let i = 1; i < 12; i++) { req.result.push({ @@ -251,7 +251,7 @@ studentsReceivingAidTaxApp.get('/age_range', (req, res, next) => { } next(); -}, response('age_range')); +}, response('age_range_all')); studentsReceivingAidTaxApp.get('/location', (req, res, next) => { req.result = [] @@ -578,8 +578,21 @@ function matchQueries(queryPartial, queryTotal) { return match; } +function whereCondition(req) { + let where = ""; + + const dims = req.query.dims; + if (dims && dims.includes("income_range")){ + where += `pnad_novo.faixa_rendimento_aux_tx is not null`; + } + + + return where; +} + studentsReceivingAidTaxApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { req.querySet = []; + let where = whereCondition(req); // Subquery para total_pop_maior_25 com filtros dinĂ¢micos let totalEstudantesQueRecebemAuxilio = req.sql.clone(); @@ -587,6 +600,7 @@ studentsReceivingAidTaxApp.get('/', rqf.parse(), rqf.build(), (req, res, next) = .field("ano_ref", "year") .field("SUM(peso_domicilio_pessoas_com_cal)", "total") .where("recebeu_rendimentos_de_programa_bolsa_familia = 1") + .where(`${where}`) .where("frequenta_escola = 1") .where("ano_ref >= 2019") .group("ano_ref") @@ -598,11 +612,12 @@ studentsReceivingAidTaxApp.get('/', rqf.parse(), rqf.build(), (req, res, next) = totalEstudantes.from("pnad_novo") .field("ano_ref", "year") .field("SUM(peso_domicilio_pessoas_com_cal)", "total") + .where(`${where}`) .where("frequenta_escola = 1") + .where("ano_ref >= 2019") .group("ano_ref") .order("ano_ref"); - req.querySet.push(totalEstudantesQueRecebemAuxilio); req.querySet.push(totalEstudantes);