diff --git a/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js index 1fb30b61644a4f627a0269b8ed597a40e4cffb94..d77aa191eead17f3e359dd8b1841615909c42d06 100644 --- a/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js +++ b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js @@ -40,6 +40,8 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i let rqf = new ReqQueryFields(); +const id2str = require(`${libs}/middlewares/id2str`); + simcaqEnrollmentDiagnosisApp.use(cache('15 day')); rqf.addField({ @@ -147,6 +149,6 @@ simcaqEnrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) .group('ano_censo') .group('simcaq_diagnostico_de_matricula.etapa'); next(); -}, query, response('enrollmentDiagnosis')); +}, query, id2str.transform(), response('enrollmentDiagnosis')); module.exports = simcaqEnrollmentDiagnosisApp; diff --git a/src/libs/routes_v2/simcaqFirstReport.js b/src/libs/routes_v2/simcaqFirstReport.js index 16640eeef3d62015b18d7f8910376328c155f3a5..d8e3cf0feaa44afda0e88d755fa9081f52e31cd3 100644 --- a/src/libs/routes_v2/simcaqFirstReport.js +++ b/src/libs/routes_v2/simcaqFirstReport.js @@ -145,7 +145,7 @@ simcaqFirstReportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { req.sql.from('simcaq_relatorio_1') .field('simcaq_relatorio_1.etapa', 'education_level_short_id') .field('simcaq_relatorio_1.turno', 'shift_id') - .field('simcaq_relatorio_1.localizacao_id', 'location') + .field('simcaq_relatorio_1.localizacao_id', 'location_id') .field('SUM(simcaq_relatorio_1.num_matriculas)', 'num_enrollments') .field('SUM(simcaq_relatorio_1.num_escolas)', 'num_schools') .field('ano_censo', 'year') @@ -154,11 +154,6 @@ simcaqFirstReportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .group('simcaq_relatorio_1.turno') .group('simcaq_relatorio_1.localizacao_id'); next(); -}, query, (req, res, next) => { - req.result.forEach((result) => { - result.shift = id2str.shift(result.shift_id); - }); - next(); -}, response('simcaqFirstReport')); +}, query, id2str.transform(), response('simcaqFirstReport')); module.exports = simcaqFirstReportApp; diff --git a/src/libs/routes_v2/simcaqSecondReport.js b/src/libs/routes_v2/simcaqSecondReport.js index ccdd2f9b6b2acfdab9b19db6521d1b2c9230abaf..4e8e75f9363a4ba16a88d9b094877bfbdd8e0d05 100644 --- a/src/libs/routes_v2/simcaqSecondReport.js +++ b/src/libs/routes_v2/simcaqSecondReport.js @@ -40,6 +40,8 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i let rqf = new ReqQueryFields(); +const id2str = require(`${libs}/middlewares/id2str`); + simcaqSecondReportApp.use(cache('15 day')); rqf.addField({ @@ -125,6 +127,6 @@ simcaqSecondReportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .group('ano_censo') .group('dependencia_adm_priv'); next(); -}, query, response('simcaqSecondReport')); +}, query, id2str.transform(), response('simcaqSecondReport')); module.exports = simcaqSecondReportApp;