From 9c7176ac43d91d9b2c4764db337b6cd9afada9eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20A=2E=20Okida=20Gon=C3=A7alves?= <laog19@inf.ufpr.br>
Date: Mon, 27 Mar 2023 11:23:58 -0300
Subject: [PATCH] Fix routes to use escola_id field instead of id, removed
unnecessary console logs
---
src/libs/routes_v2/api.js | 4 ++--
...t_diagnosis.js => simcaqEnrollmentDiagnosis.js} | 14 ++++++--------
src/libs/routes_v2/simcaqFirstReport.js | 4 ++--
src/libs/routes_v2/simcaqSecondReport.js | 4 ++--
4 files changed, 12 insertions(+), 14 deletions(-)
rename src/libs/routes_v2/{enrollment_diagnosis.js => simcaqEnrollmentDiagnosis.js} (93%)
diff --git a/src/libs/routes_v2/api.js b/src/libs/routes_v2/api.js
index cb19b9a4..f6804584 100644
--- a/src/libs/routes_v2/api.js
+++ b/src/libs/routes_v2/api.js
@@ -136,7 +136,7 @@ const courseStudents = require(`${libs}/routes_v2/courseStudents`);
const simcaqFirstReport = require(`${libs}/routes_v2/simcaqFirstReport`);
-const enrollmentDiagnosis = require(`${libs}/routes_v2/enrollment_diagnosis`);
+const simcaqEnrollmentDiagnosis = require(`${libs}/routes_v2/simcaqEnrollmentDiagnosis`);
const simcaqSecondReport = require(`${libs}/routes_v2/simcaqSecondReport`);
@@ -199,7 +199,7 @@ api.use('/universityLocalOffer', universityLocalOffer);
api.use('/message', message);
api.use('/course_students', courseStudents);
api.use('/simcaq_first_report', simcaqFirstReport);
-api.use('/enrollment_diagnosis', enrollmentDiagnosis);
+api.use('/simcaq_enrollment_diagnosis', simcaqEnrollmentDiagnosis);
api.use('/simcaq_second_report', simcaqSecondReport);
module.exports = api;
diff --git a/src/libs/routes_v2/enrollment_diagnosis.js b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
similarity index 93%
rename from src/libs/routes_v2/enrollment_diagnosis.js
rename to src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
index 221549e5..bd23cf25 100644
--- a/src/libs/routes_v2/enrollment_diagnosis.js
+++ b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
@@ -20,7 +20,7 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
const express = require('express');
-const enrollmentDiagnosisApp = express.Router();
+const simcaqEnrollmentDiagnosisApp = express.Router();
const libs = `${process.cwd()}/libs`;
@@ -40,7 +40,7 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i
let rqf = new ReqQueryFields();
-enrollmentDiagnosisApp.use(cache('15 day'));
+simcaqEnrollmentDiagnosisApp.use(cache('15 day'));
rqf.addField({
name: 'filter',
@@ -76,11 +76,11 @@ rqf.addField({
}).addValue({
name: 'school',
table: 'simcaq_diagnostico_de_matricula',
- tableField: 'id',
+ tableField: 'escola_id',
where: {
relation: '=',
type: 'integer',
- field: 'id'
+ field: 'escola_id'
}
}).addValue({
name: 'stage',
@@ -111,7 +111,7 @@ rqf.addField({
}
});
-enrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+simcaqEnrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.sql.from('simcaq_diagnostico_de_matricula')
.field('simcaq_diagnostico_de_matricula.etapa', 'stage')
.field('SUM(simcaq_diagnostico_de_matricula.total)', 'total')
@@ -125,9 +125,7 @@ enrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('SUM(simcaq_diagnostico_de_matricula.matriculas_urbana)', 'urban_enrollments')
.field('SUM(simcaq_diagnostico_de_matricula.matriculas_rural)', 'rural_enrollments')
.group('simcaq_diagnostico_de_matricula.etapa');
-
- console.log(req.sql.toString());
next();
}, query, response('enrollmentDiagnosis'));
-module.exports = enrollmentDiagnosisApp;
+module.exports = simcaqEnrollmentDiagnosisApp;
diff --git a/src/libs/routes_v2/simcaqFirstReport.js b/src/libs/routes_v2/simcaqFirstReport.js
index db300da5..b6bde164 100644
--- a/src/libs/routes_v2/simcaqFirstReport.js
+++ b/src/libs/routes_v2/simcaqFirstReport.js
@@ -85,11 +85,11 @@ rqf.addField({
}).addValue({
name: 'school',
table: 'simcaq_relatorio_1',
- tableField: 'id',
+ tableField: 'escola_id',
where: {
relation: '=',
type: 'integer',
- field: 'id'
+ field: 'escola_id'
}
}).addValue({
name: 'location',
diff --git a/src/libs/routes_v2/simcaqSecondReport.js b/src/libs/routes_v2/simcaqSecondReport.js
index 6babe383..fdd583d6 100644
--- a/src/libs/routes_v2/simcaqSecondReport.js
+++ b/src/libs/routes_v2/simcaqSecondReport.js
@@ -58,11 +58,11 @@ rqf.addField({
}).addValue({
name: 'school',
table: 'simcaq_relatorio_2',
- tableField: 'id',
+ tableField: 'escola_id',
where: {
relation: '=',
type: 'integer',
- field: 'id'
+ field: 'escola_id'
}
}).addValue({
name: 'city',
--
GitLab