From 57116c1fae90b007c221f9a6074bad63cbc82c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20A=2E=20Okida=20Gon=C3=A7alves?= <laog19@inf.ufpr.br>
Date: Tue, 28 Mar 2023 11:37:11 -0300
Subject: [PATCH] Fix issue when calling id2str methods
---
src/libs/routes_v2/simcaqEnrollmentDiagnosis.js | 4 +++-
src/libs/routes_v2/simcaqFirstReport.js | 9 ++-------
src/libs/routes_v2/simcaqSecondReport.js | 4 +++-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
index 1fb30b61..d77aa191 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 16640eee..d8e3cf0f 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 ccdd2f9b..4e8e75f9 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;
--
GitLab