From 02bd81387b7ca1b868d4ab0cdddc282c1d64fac0 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Fri, 28 Mar 2025 09:18:11 -0300
Subject: [PATCH 1/2] fix: update region codes in revenue conversion; remove
unused field from student revenue query
---
src/libs/convert/revenue.js | 8 +++-----
src/libs/routes_v1/studentRevenue.js | 1 -
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/libs/convert/revenue.js b/src/libs/convert/revenue.js
index 006e2662..fb3c819a 100644
--- a/src/libs/convert/revenue.js
+++ b/src/libs/convert/revenue.js
@@ -21,14 +21,12 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
module.exports = function regionCode(id) {
switch (id) {
case 1:
- return 'Receitas';
- case 2:
return 'Rede pública (anual)'
- case 3:
+ case 2:
return 'Rede pública (mensal)';
- case 4:
+ case 3:
return 'Rede pública e conveniada (anual)';
- case 5:
+ case 4:
return 'Rede pública e conveniada (mensal)';
}
};
diff --git a/src/libs/routes_v1/studentRevenue.js b/src/libs/routes_v1/studentRevenue.js
index 2b62671d..8136ea0a 100644
--- a/src/libs/routes_v1/studentRevenue.js
+++ b/src/libs/routes_v1/studentRevenue.js
@@ -135,7 +135,6 @@ studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if (!typeFilter || (typeFilter && (!obj.state && !obj.city && !obj.region))) {
req.sql.from('receitas')
.field('receitas.ano', 'year')
- .field('SUM(receitas.receitas)', 'total_receitas')
.field('SUM(receuta_aluno_ano_publica)', '(total_receita_aluno_ano_publica)')
.field('SUM(receita_aluno_mes_publica)', 'total_receita_aluno_mes_publica')
.field('SUM(receita_aluno_ano_publica_mais_conveniada)', 'total_receita_aluno_ano_publica_mais_conveniada')
--
GitLab
From f6f6b64c966b19ba75217f55721806b0061630d3 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Fri, 28 Mar 2025 09:21:34 -0300
Subject: [PATCH 2/2] refactor: remove console.log statements from route
handlers
---
src/libs/routes_v1/enrollmentAggregate.js | 2 --
src/libs/routes_v1/newPnad.js | 1 -
src/libs/routes_v1/studentRevenue.js | 1 -
3 files changed, 4 deletions(-)
diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js
index 7e8cd3fa..a561f137 100644
--- a/src/libs/routes_v1/enrollmentAggregate.js
+++ b/src/libs/routes_v1/enrollmentAggregate.js
@@ -512,8 +512,6 @@ rqf.addField({
// Return all cities
enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
- console.log(req.query);
-
if (req.query.dims && req.query.dims.includes('gender'))
{
req.sql.from('escola')
diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js
index 5bfb7b8a..e9549404 100644
--- a/src/libs/routes_v1/newPnad.js
+++ b/src/libs/routes_v1/newPnad.js
@@ -518,7 +518,6 @@ PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('pnad_novo.ano_ref', 'year')
.group('pnad_novo.ano_ref')
.order('pnad_novo.ano_ref')
- console.log(req.sql.toString())
next();
}, query, id2str.transform(false), response('pnad_novo'));
diff --git a/src/libs/routes_v1/studentRevenue.js b/src/libs/routes_v1/studentRevenue.js
index 8136ea0a..271566af 100644
--- a/src/libs/routes_v1/studentRevenue.js
+++ b/src/libs/routes_v1/studentRevenue.js
@@ -107,7 +107,6 @@ rqf.addField({
studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if (req.query.dims && req.query.dims.includes('receitas')) {
let obj = {};
- console.log(req.query.filter)
let whereCondition = req.query.filter.includes("region") ? "" : "receitas.cod_ibge = 0";
let typeFilter = false;
--
GitLab