From 2ba2642d8c90059ed9738d4b808712b85e4fc25c Mon Sep 17 00:00:00 2001
From: Joao Pedro <jpv.ramalho2013@gmail.com>
Date: Mon, 10 Mar 2025 11:53:05 -0300
Subject: [PATCH 1/6] [ADD] indicador despesas

---
 docker-compose.yml                     |  11 ++
 entrypoint.sh                          |   5 +
 gulpfile.babel.js                      |  22 ++--
 gulpfile.template.js                   |  20 ++++
 src/libs/convert/expenses.js           |  41 +++++++
 src/libs/middlewares/aggregateData.js  |  10 +-
 src/libs/middlewares/expensesParser.js |  23 ++++
 src/libs/middlewares/id2str.js         |   7 +-
 src/libs/routes_v1/api.js              |   7 +-
 src/libs/routes_v1/expenses.js         | 148 +++++++++++++++++++++++++
 10 files changed, 274 insertions(+), 20 deletions(-)
 create mode 100644 docker-compose.yml
 create mode 100644 entrypoint.sh
 create mode 100644 gulpfile.template.js
 create mode 100644 src/libs/convert/expenses.js
 create mode 100644 src/libs/middlewares/expensesParser.js
 create mode 100644 src/libs/routes_v1/expenses.js

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..85266ff9
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+services:
+  simcaq-node:
+    container_name: simcaq-node
+    build: .
+    ports:
+      - '3000:3000'
+    develop:
+      watch:
+        - action: sync
+          path: .
+          target: /API
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 00000000..04db5192
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+echo "Starting simcaq-node"
+gulp watch &> /dev/null &
+cd build
+NODE_ENV=production gulp run
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index c661d5af..1d0724e1 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -43,12 +43,12 @@ gulp.task('compile', ['lint'], () => {
     gulp.src('src/**/*.js')
     .pipe(cache.filter())       // cache source files
     .pipe(babel())      // compile only modified files
-    // .pipe(cache.cache())        // cache compiled files
+    .pipe(cache.cache())        // cache compiled files
     .pipe(gulp.dest('build'));  // move compiled files to build directory
 });
 
 gulp.task('build', ['compile'], () => {
-    var filesToCopy = [ 'config.json', 'package.json' ];
+    var filesToCopy = [ 'config.json', 'package.json', '.eslintignore', '.eslintrc.json' ];
     // copy configuration file to build directory
     gulp.src(filesToCopy)
     .pipe(gulp.dest('build'));
@@ -93,24 +93,16 @@ gulp.task('test', ['pre-test'], () => {
     });
 });
 
-gulp.task('watch', ['compile'], () => {
+gulp.task('watch', () => {
     console.log('Watching source directory for changes');
-    gulp.watch('src/**/*.js').on('change', () => {
+    return gulp.watch('src/**/*.js').on('change', () => {
         console.log('Recompiling source');
         gulp.start('compile');
         console.log('Source recompilation done');
     });
 });
 
-gulp.task('run', () => {
-    process.chdir('build');
-    nodemon({
-        script: 'server.js',
-        tasks: ['watch'],
-        ignore: ["test/test.js", "gulpfile.babel.js"],
-        ext: 'js html json',
-        env: { 'NODE_ENV': process.env.NODE_ENV }
-    });
+gulp.task('default', () => {
+    console.log("Não execuatar apenas gulp, execute da forma:");
+    console.log("\t\tgulp <task>");
 });
-
-gulp.task('default', ['run']);
diff --git a/gulpfile.template.js b/gulpfile.template.js
new file mode 100644
index 00000000..3de679df
--- /dev/null
+++ b/gulpfile.template.js
@@ -0,0 +1,20 @@
+const gulp = require('gulp');
+
+const nodemon = require('gulp-nodemon');
+
+gulp.task('run', () => {
+    // process.chdir('build');
+    nodemon({
+        script: 'server.js',
+        // tasks: ['watch'],
+        ignore: ["test/test.js", "gulpfile.babel.js"],
+        ext: 'js html json',
+        env: { 'NODE_ENV': process.env.NODE_ENV }
+    });
+});
+
+gulp.task('default', () => {
+    console.log("Não execuatar apenas gulp, execute da forma:");
+    console.log("\t\tgulp <task>");
+});
+
diff --git a/src/libs/convert/expenses.js b/src/libs/convert/expenses.js
new file mode 100644
index 00000000..82bf080b
--- /dev/null
+++ b/src/libs/convert/expenses.js
@@ -0,0 +1,41 @@
+/*
+Copyright (C) 2024 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function regionCode(id) {
+    switch (id) {
+        case 1:
+        return "Nome Ente"
+        case 2:
+        return 'Despesas';
+        case 3:
+        return 'Matrículas Públicas';
+        case 4:
+        return 'Matrículas Públicas Mais Conveniada';
+        case 5:
+        return 'Despesas Aluno Ano Pública'
+        case 6:
+        return 'Despesas Aluno Mês Pública';
+        case 7:
+        return 'Despesas Aluno Ano Pública Mais Conveniada';
+        case 8:
+        return 'Despesas Aluno Mês Pública Mais Conveniada';
+    }
+};
+
diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js
index eed373dd..a4429af8 100644
--- a/src/libs/middlewares/aggregateData.js
+++ b/src/libs/middlewares/aggregateData.js
@@ -35,10 +35,12 @@ const convert = {
     contract_type_entity: 'contractType',
     total_doc: "totalDoc",
     education_degree_entity: "educationDegreeEntity",
-    government_agreement: "governmentAgreement"
+    government_agreement: "governmentAgreement",
+    despesas_alunos: "expenses"
 }
 
 function aggregateData(req, res, next) {
+    console.log("Teste if agg");
     if (req.query.dims) {
         const newResult = []
         const aggregateFields = [
@@ -62,7 +64,8 @@ function aggregateData(req, res, next) {
             'age_range_entity',
             'post_graduation_entity',
             'contract_type_entity',
-            'education_degree_entity'
+            'education_degree_entity',
+            'despesas_alunos'
         ]
         let id;
         const fields = req.query.dims.split(',');
@@ -70,9 +73,12 @@ function aggregateData(req, res, next) {
         let currentNonAggregateField;
     
         // Verifica se o filtro passado está presente nos filtros agregados
+        console.log("fields:");
+        console.log(fields);
         fields.forEach(field => {if (aggregateFields.includes(field)) currentAggregateField = field; else currentNonAggregateField = field});
         if (currentAggregateField) {
             req.result.forEach((r) => {
+                console.log("aggregate data aaa");
                 // Alguns filtros começam com o id = 0 outros id = 1
                 id = ['ethnic_group', 'integral_time_agg'].includes(currentAggregateField) ? 0 : 1;
                 for (const property in r) {
diff --git a/src/libs/middlewares/expensesParser.js b/src/libs/middlewares/expensesParser.js
new file mode 100644
index 00000000..a791f1e3
--- /dev/null
+++ b/src/libs/middlewares/expensesParser.js
@@ -0,0 +1,23 @@
+/*
+Middleware que remove o campo "region" quando o campo "city" está ativo nos filtros.
+Devido à limitações na tabela de dados, quando ambos campos estão ativos o filtro por
+"região" funciona incorretamente. 
+*/
+module.exports = function expensesParser(req, res, next) {
+    console.log(req.query);
+
+    if (req.query && req.query.filter) {
+        const jsonString = `{${req.query.filter.replace(/(\w+):/g, '"$1":')}}`;
+        const obj = JSON.parse(jsonString);
+
+        if ("city" in obj && "region" in obj) {
+            delete obj.region;
+            const customString = Object.entries(obj)
+                .map(([key, value]) => `${key}:"${value}"`)
+                .join(',');
+            req.query.filter = customString;
+        }
+    }
+
+    next();
+};
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index f366d90a..324511a7 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -126,6 +126,7 @@ const ageRangeEntity = require(`${libs}/convert/ageRangeEntity`);
 const postGraduationEntity = require(`${libs}/convert/postGraduationEntity`);
 const totalDoc = require(`${libs}/convert/totalDoc`);
 const educationDegreeEntity = require(`${libs}/convert/educationDegreeEntity`);
+const expenses = require(`${libs}/convert/expenses.js`)
 
 const ids = {
     gender_id: gender,
@@ -244,7 +245,8 @@ const ids = {
     post_graduation_entity: postGraduationEntity,
     special_education_entity: specialEducationEntity,
     total_doc: totalDoc,
-    education_degree_entity: educationDegreeEntity
+    education_degree_entity: educationDegreeEntity,
+    despesas_id: expenses
 };
 
 function transform(removeId=false) {
@@ -385,5 +387,6 @@ module.exports = {
     postGraduationEntity,
     specialEducationEntity,
     totalDoc,
-    educationDegreeEntity
+    educationDegreeEntity,
+    expenses
 };
diff --git a/src/libs/routes_v1/api.js b/src/libs/routes_v1/api.js
index bffc8b5d..494d13c8 100644
--- a/src/libs/routes_v1/api.js
+++ b/src/libs/routes_v1/api.js
@@ -157,6 +157,11 @@ const email = require(`${libs}/routes_v1/email`);
 
 const uniLocalOfferAggregate = require(`${libs}/routes_v1/uniLocalOfferAggregate`)
 
+const expenses = require(`${libs}/routes_v1/expenses`)
+
+const expensesParser = require(`${libs}/middlewares/expensesParser`);
+
+
 api.get('/', (req, res) => {
     res.json({ msg: 'SimCAQ API v1 is running' });
 });
@@ -223,7 +228,7 @@ api.use('/employeesAggregate', employeesAggregate);
 api.use('/course_aggregate', courseAggregate);
 api.use('/federativeEntity', federativeEntity);
 api.use('/uni_offer_aggregate', uniLocalOfferAggregate);
-
+api.use('/expenses', expensesParser, expenses);
 
 //Publication 
 api.use('/publication', publication);
diff --git a/src/libs/routes_v1/expenses.js b/src/libs/routes_v1/expenses.js
new file mode 100644
index 00000000..b860673e
--- /dev/null
+++ b/src/libs/routes_v1/expenses.js
@@ -0,0 +1,148 @@
+/*
+Copyright (C) 2024 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+const express = require('express');
+
+const ExpensesApp = express.Router();
+
+const libs = `${process.cwd()}/libs`;
+
+const squel = require('squel');
+
+const query = require(`${libs}/middlewares/query`).query;
+
+const response = require(`${libs}/middlewares/response`);
+
+const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
+
+const id2str = require(`${libs}/middlewares/id2str`);
+
+const config = require(`${libs}/config`); 
+
+const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
+
+const aggregateData = require(`${libs}/middlewares/aggregateData`);
+
+let rqf = new ReqQueryFields();
+
+ExpensesApp.use(cache('15 day'));
+
+ExpensesApp.get('/years', (req, res, next) => {
+    req.sql.from('despesas')
+    .field('DISTINCT despesas.ano_censo', 'year')
+    .where('despesas.ano_censo is not null')
+    next();
+}, query, response('years'))
+
+// rqf.addValue({
+//     name: 'location',
+//     table: 'despesas',
+//     tableField: 'nome_ente',
+//     resultField: 'location_id',
+//     where: {
+//         relation: '=',
+//         type: 'integer',
+//         field: 'localizacao_id'
+//     }
+// });
+
+rqf.addField({
+    name: 'filter',
+    field: false,
+    where: true
+}).addField({
+    name: 'dims',
+    field: true,
+    where: false
+}).addValue({
+    name: 'min_year',
+    table: 'despesas',
+    tableField: 'ano_censo',
+    resultField: 'year',
+    where: {
+        relation: '>=',
+        type: 'integer',
+        field: 'ano_censo'
+    }
+}).addValue({
+    name: 'max_year',
+    table: 'despesas',
+    tableField: 'ano_censo',
+    resultField: 'year',
+    where: {
+        relation: '<=',
+        type: 'integer',
+        field: 'ano_censo'
+    }
+}).addValue({
+    name: 'region',
+    table: 'estado',
+    tableField: ['nome_ente', 'cod_ibge', 'id', 'regiao_id'],
+    resultField: ['state_name', 'state_cod_ibge', 'state_id', 'region_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'regiao_id',
+    },
+    join: {
+        primary: 'id',
+        foreign: 'cod_ibge',
+        foreignTable: 'despesas'
+    }
+})
+
+
+ExpensesApp.get('/', rqf.parse(), rqf.build(),  (req, res, next) => {
+
+    if (req.query.dims && req.query.dims.includes('despesas')) {
+        let whereCondition = req.query.filter.includes("region") ? "" : "despesas.cod_ibge = 0";
+        let filterId;
+        const filters = req.query.filter.split(",");
+        filters.forEach((filter) => {
+            if (filter.includes("state") || filter.includes("city")) {
+                filterId = Number(filter.split(":")[1].replace(/"/g, ""));
+                whereCondition = `despesas.cod_ibge = ${filterId}`
+            }
+        })
+
+        console.log("Filtro 2");
+        console.log(filters);
+
+        req.sql.from('despesas')
+        .field('despesas.ano_censo', 'year')
+        .field('despesas.nome_ente', 'total_nome_ente')
+        .field('despesas.despesas', 'total_despesas')
+        .field('matriculas_publica', 'total_matriculas_publica')
+        .field('matriculas_publicas_mais_conveniada', 'total_matriculas_publicas_mais_conveniada')
+        .field('gasto_aluno_ano_publica', 'total_gasto_aluno_ano_publica')
+        .field('gasto_aluno_mes_publica', 'total_gasto_aluno_mes_publica')
+        .field('gasto_aluno_ano_publica_mais_conveniada', 'total_gasto_aluno_ano_publica_mais_conveniada')
+        .field('gasto_aluno_mes_publica_mais_conveniada', 'total_gasto_aluno_mes_publica_mais_conveniada')
+        .where(`${whereCondition}`)
+        .order('despesas.cod_ibge')
+    }
+
+    console.log("Requisição !")
+    console.log(req.query)
+
+    next();
+}, query, aggregateData, id2str.transform(false), response('expenses'));
+
+module.exports = ExpensesApp;
\ No newline at end of file
-- 
GitLab


From 34e4b51b897b98437013dc023018a406de3279c4 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Tue, 18 Mar 2025 10:48:02 -0300
Subject: [PATCH 2/6] feat: add age range conversion for 19 to 64 years and
 update related routes

---
 src/libs/convert/ageRange19to64.js            | 38 +++++++++++++++++++
 src/libs/middlewares/id2str.js                |  8 ++--
 .../routes_v1/basicEducationConclusion.js     | 12 +++---
 3 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 src/libs/convert/ageRange19to64.js

diff --git a/src/libs/convert/ageRange19to64.js b/src/libs/convert/ageRange19to64.js
new file mode 100644
index 00000000..47020867
--- /dev/null
+++ b/src/libs/convert/ageRange19to64.js
@@ -0,0 +1,38 @@
+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function ageRange19to64(id) {
+    switch (id) {
+        case 6:
+        return '19 a 24 anos';
+        case 7:
+        return '25 a 29 anos';
+        case 8:
+        return '30 a 40 anos';
+        case 9:
+        return '41 a 50 anos';
+        case 10:
+        return '51 a 64 anos';
+        case 11:
+        return 'Mais que 64 anos';
+        default:
+        return 'Não declarada';
+    }
+};
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index 730d620e..e144fb97 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -128,6 +128,7 @@ const totalDoc = require(`${libs}/convert/totalDoc`);
 const educationDegreeEntity = require(`${libs}/convert/educationDegreeEntity`);
 const revenue = require(`${libs}/convert/revenue`);
 const studentCost = require(`${libs}/convert/studentCost`);
+const ageRange19to64 = require(`${libs}/convert/ageRange19to64`);
 
 const ids = {
     gender_id: gender,
@@ -248,7 +249,8 @@ const ids = {
     total_doc: totalDoc,
     education_degree_entity: educationDegreeEntity,
     receitas_id: revenue,
-    student_cost: studentCost
+    student_cost: studentCost,
+    age_range_19_to_64_id: ageRange19to64
 };
 
 function transform(removeId=false) {
@@ -258,7 +260,6 @@ function transform(removeId=false) {
         }
         // Para cada objeto do resultado
         req.result.forEach((obj) => {
-            console.log(obj),
             Object.keys(obj).forEach((key) => {
                 // Se não há uma função especificada, retorna
                 if(typeof ids[key] === 'undefined') return;
@@ -392,5 +393,6 @@ module.exports = {
     totalDoc,
     educationDegreeEntity,
     revenue,
-    studentCost
+    studentCost,
+    ageRange19to64
 };
diff --git a/src/libs/routes_v1/basicEducationConclusion.js b/src/libs/routes_v1/basicEducationConclusion.js
index fb745299..0d84822c 100644
--- a/src/libs/routes_v1/basicEducationConclusion.js
+++ b/src/libs/routes_v1/basicEducationConclusion.js
@@ -242,16 +242,16 @@ basicEducationConclusion.get('/state', (req, res, next) => {
     next();
 }, response('state'));
 
-basicEducationConclusion.get('/age_range_all', (req, res, next) => {
+basicEducationConclusion.get('/age_range_19_to_64', (req, res, next) => {
     req.result = []
-    for (let i = 1; i < 12; i++) {
+    for (let i = 6; i <= 11; i++) {
         req.result.push({
-            id: i, name: id2str.ageRangeAll(i)
+            id: i, name: id2str.ageRange19to64(i)
         });
     }
 
     next();
-}, response('age_range_all'));
+}, response('age_range_19_to_64'));
 
 basicEducationConclusion.get('/location', (req, res, next) => {
     req.result = []
@@ -414,10 +414,10 @@ rqf.addField({
         field: 'cor_raca'
     }
 }).addValue({
-    name: 'age_range_all',
+    name: 'age_range_19_to_64',
     table: 'pnad_novo',
     tableField: 'faixa_etaria',
-    resultField: 'age_range_all_id',
+    resultField: 'age_range_19_to_64_id',
     where: {
         relation: '=',
         type: 'integer',
-- 
GitLab


From cbd00f501832a3b8d307f6baeae2aea2a1cf5eed Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Tue, 18 Mar 2025 11:31:46 -0300
Subject: [PATCH 3/6] fix: remove hardcoded capital code and adjust query
 conditions for cap_code dimension

---
 src/libs/routes_v1/basicEducationConclusion.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/routes_v1/basicEducationConclusion.js b/src/libs/routes_v1/basicEducationConclusion.js
index 0d84822c..a30c3afd 100644
--- a/src/libs/routes_v1/basicEducationConclusion.js
+++ b/src/libs/routes_v1/basicEducationConclusion.js
@@ -120,7 +120,6 @@ basicEducationConclusion.get('/cap_code', (req, res, next) => {
         });
         }
     }
-    req.result.push({id: 99, name: id2str.capitalCode(99)});
 
     next();
 }, response('cap_code'));
@@ -604,6 +603,10 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
         totalPopEdBasMaior19.where("faixa_rendimento_aux_tx is not null");
     }
 
+    if (req.query.dims && req.query.dims.includes("cap_code")) {
+        totalPopMaior19.where("cod_cap < 99");
+    }
+
     req.querySet.push(totalPopEdBasMaior19);
     req.querySet.push(totalPopMaior19);
 
-- 
GitLab


From 4b0c6191a435fb9837980dea4947f4da571db16b Mon Sep 17 00:00:00 2001
From: Joao Pedro <jpv.ramalho2013@gmail.com>
Date: Tue, 18 Mar 2025 11:38:56 -0300
Subject: [PATCH 4/6] =?UTF-8?q?[mod]=20remo=C3=A7=C3=A3o=20de=20console.lo?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libs/convert/expenses.js           | 18 ++++++++++--------
 src/libs/middlewares/expensesParser.js |  2 --
 src/libs/routes_v1/expenses.js         |  9 ++-------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/libs/convert/expenses.js b/src/libs/convert/expenses.js
index 82bf080b..5cd28c4e 100644
--- a/src/libs/convert/expenses.js
+++ b/src/libs/convert/expenses.js
@@ -21,21 +21,23 @@ along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
 module.exports = function regionCode(id) {
     switch (id) {
         case 1:
-        return "Nome Ente"
+            return "Ano";
         case 2:
-        return 'Despesas';
+            return "Entidade";
         case 3:
-        return 'Matrículas Públicas';
+            return 'Despesas';
         case 4:
-        return 'Matrículas Públicas Mais Conveniada';
+            return 'Matrículas Públicas';
         case 5:
-        return 'Despesas Aluno Ano Pública'
+            return 'Matrículas Públicas Mais Conveniada';
         case 6:
-        return 'Despesas Aluno Mês Pública';
+            return 'Despesas Aluno Ano Pública'
         case 7:
-        return 'Despesas Aluno Ano Pública Mais Conveniada';
+            return 'Despesas Aluno Mês Pública';
         case 8:
-        return 'Despesas Aluno Mês Pública Mais Conveniada';
+            return 'Despesas Aluno Ano Pública Mais Conveniada';
+        case 9:
+            return 'Despesas Aluno Mês Pública Mais Conveniada';
     }
 };
 
diff --git a/src/libs/middlewares/expensesParser.js b/src/libs/middlewares/expensesParser.js
index a791f1e3..5ba0c8eb 100644
--- a/src/libs/middlewares/expensesParser.js
+++ b/src/libs/middlewares/expensesParser.js
@@ -4,8 +4,6 @@ Devido à limitações na tabela de dados, quando ambos campos estão ativos o f
 "região" funciona incorretamente. 
 */
 module.exports = function expensesParser(req, res, next) {
-    console.log(req.query);
-
     if (req.query && req.query.filter) {
         const jsonString = `{${req.query.filter.replace(/(\w+):/g, '"$1":')}}`;
         const obj = JSON.parse(jsonString);
diff --git a/src/libs/routes_v1/expenses.js b/src/libs/routes_v1/expenses.js
index b860673e..36248659 100644
--- a/src/libs/routes_v1/expenses.js
+++ b/src/libs/routes_v1/expenses.js
@@ -122,11 +122,9 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(),  (req, res, next) => {
             }
         })
 
-        console.log("Filtro 2");
-        console.log(filters);
-
         req.sql.from('despesas')
         .field('despesas.ano_censo', 'year')
+        .field('despesas.ano_censo', 'total_ano')
         .field('despesas.nome_ente', 'total_nome_ente')
         .field('despesas.despesas', 'total_despesas')
         .field('matriculas_publica', 'total_matriculas_publica')
@@ -136,12 +134,9 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(),  (req, res, next) => {
         .field('gasto_aluno_ano_publica_mais_conveniada', 'total_gasto_aluno_ano_publica_mais_conveniada')
         .field('gasto_aluno_mes_publica_mais_conveniada', 'total_gasto_aluno_mes_publica_mais_conveniada')
         .where(`${whereCondition}`)
-        .order('despesas.cod_ibge')
+        .order('despesas.ano_censo')
     }
 
-    console.log("Requisição !")
-    console.log(req.query)
-
     next();
 }, query, aggregateData, id2str.transform(false), response('expenses'));
 
-- 
GitLab


From 22690a1e8fd5d64d2a745d6b8a9fd5b50ec570db Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Thu, 20 Mar 2025 10:22:50 -0300
Subject: [PATCH 5/6] fix: update income_range id and income_range variable
 pulled from db

---
 .../routes_v1/basicEducationConclusion.js     | 81 +++++++++----------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/libs/routes_v1/basicEducationConclusion.js b/src/libs/routes_v1/basicEducationConclusion.js
index a30c3afd..3b22f4d3 100644
--- a/src/libs/routes_v1/basicEducationConclusion.js
+++ b/src/libs/routes_v1/basicEducationConclusion.js
@@ -36,9 +36,9 @@ const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
 
 const id2str = require(`${libs}/middlewares/id2str`);
 
-const config = require(`${libs}/config`); 
+const config = require(`${libs}/config`);
 
-const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
+const cache = require('apicache').options({ debug: config.debug, statusCodes: { include: [200] } }).middleware;
 
 let rqf = new ReqQueryFields();
 
@@ -46,8 +46,8 @@ basicEducationConclusion.use(cache('15 day'));
 
 basicEducationConclusion.get('/years', (req, res, next) => {
     req.sql.from('pnad_novo')
-    .field('DISTINCT pnad_novo.ano_ref', 'year')
-    .where('pnad_novo.ano_ref >= 2019')
+        .field('DISTINCT pnad_novo.ano_ref', 'year')
+        .where('pnad_novo.ano_ref >= 2019')
     next();
 }, query, response('years'));
 
@@ -60,7 +60,7 @@ basicEducationConclusion.get('/illiteracy', (req, res, next) => {
         });
 
     }
-    req.result.push({id: 9, name: id2str.illiteracy(9)});
+    req.result.push({ id: 9, name: id2str.illiteracy(9) });
     next();
 }, response('illiteracy'));
 
@@ -73,7 +73,7 @@ basicEducationConclusion.get('/years_of_study', (req, res, next) => {
         });
     }
 
-    req.result.push({id: 99, name: id2str.yearsOfStudy(99)});
+    req.result.push({ id: 99, name: id2str.yearsOfStudy(99) });
     next();
 }, response('years_of_study'));
 
@@ -85,7 +85,7 @@ basicEducationConclusion.get('/instruction_level', (req, res, next) => {
             id: i, name: id2str.instructionLevel(i)
         });
     }
-    req.result.push({id: 99, name: id2str.instructionLevel(99)});
+    req.result.push({ id: 99, name: id2str.instructionLevel(99) });
     next();
 }, response('instruction_level'));
 
@@ -96,7 +96,7 @@ basicEducationConclusion.get('/new_pnad_adm_dependency', (req, res, next) => {
             id: i, name: id2str.newPnadAdmDependency(i)
         });
     }
-    req.result.push({id: 99, name: id2str.newPnadAdmDependency(99)});
+    req.result.push({ id: 99, name: id2str.newPnadAdmDependency(99) });
     next();
 }, response('new_pnad_adm_dependency'));
 
@@ -115,9 +115,9 @@ basicEducationConclusion.get('/cap_code', (req, res, next) => {
     req.result = []
     for (let i = 11; i < 54; i++) {
         if (id2str.capitalCode(i) !== 'Não informado') {
-        req.result.push({
-            id: i, name: id2str.capitalCode(i)
-        });
+            req.result.push({
+                id: i, name: id2str.capitalCode(i)
+            });
         }
     }
 
@@ -128,12 +128,12 @@ basicEducationConclusion.get('/metro_code', (req, res, next) => {
     req.result = []
     for (let i = 13; i < 53; i++) {
         if (id2str.metroCode(i) !== 'Não informado') {
-        req.result.push({
-            id: i, name: id2str.metroCode(i)
-        });
+            req.result.push({
+                id: i, name: id2str.metroCode(i)
+            });
         }
     }
-    req.result.push({id: 99, name: id2str.metroCode(99)});
+    req.result.push({ id: 99, name: id2str.metroCode(99) });
 
     next();
 }, response('metro_code'));
@@ -147,7 +147,7 @@ basicEducationConclusion.get('/attended_modality', (req, res, next) => {
     }
     // Remove the option with id equals 10 => This option exists in the database, a better solution to this would be remove the option from the database
     req.result.splice(req.result.findIndex((item) => item.id === 10), 1);
-    req.result.push({id: 99, name: id2str.attendedModality(99)});
+    req.result.push({ id: 99, name: id2str.attendedModality(99) });
     next();
 }, response('attended_modality'));
 
@@ -158,7 +158,7 @@ basicEducationConclusion.get('/income_range', (req, res, next) => {
             id: i, name: id2str.incomeRange(i)
         });
     }
-    req.result.push({id: 10, name: id2str.incomeRange(10)});
+    req.result.push({ id: 9, name: id2str.incomeRange(9) });
     next();
 }, response('income_range'));
 
@@ -189,7 +189,7 @@ basicEducationConclusion.get('/new_pnad_ethnic_group', (req, res, next) => {
             id: i, name: id2str.ethnicGroupNewPnad(i)
         });
     }
-    req.result.push({id: 9, name: id2str.ethnicGroupNewPnad(9)});
+    req.result.push({ id: 9, name: id2str.ethnicGroupNewPnad(9) });
     next();
 }, response('new_pnad_ethnic_group'));
 
@@ -200,7 +200,7 @@ basicEducationConclusion.get('/bolsa_familia', (req, res, next) => {
             id: i, name: id2str.attendsSchool(i)
         });
     }
-    req.result.push({id: 9, name: id2str.attendsSchool(9)});
+    req.result.push({ id: 9, name: id2str.attendsSchool(9) });
     next();
 }, response('bolsa_familia'));
 
@@ -211,7 +211,7 @@ basicEducationConclusion.get('/modality', (req, res, next) => {
             id: i, name: id2str.modality(i)
         });
     }
-    req.result.push({id: 99, name: id2str.modality(99)});
+    req.result.push({ id: 99, name: id2str.modality(99) });
     next();
 }, response('modality'));
 
@@ -222,8 +222,8 @@ basicEducationConclusion.get('/modality_shift', (req, res, next) => {
             id: i, name: id2str.modalityShift(i)
         });
     }
-    req.result.push({id: 9, name: id2str.modalityShift(9)});
-    req.result.push({id: 99, name: id2str.modalityShift(99)});
+    req.result.push({ id: 9, name: id2str.modalityShift(9) });
+    req.result.push({ id: 99, name: id2str.modalityShift(99) });
     next();
 }, response('modality_shift'));
 
@@ -236,7 +236,7 @@ basicEducationConclusion.get('/state', (req, res, next) => {
             });
         }
     }
-    req.result.push({id: 99, name: id2str.stateName(99)});
+    req.result.push({ id: 99, name: id2str.stateName(99) });
 
     next();
 }, response('state'));
@@ -425,12 +425,12 @@ rqf.addField({
 }).addValue({
     name: 'income_range',
     table: 'pnad_novo',
-    tableField: 'faixa_rendimento_aux_tx',
+    tableField: 'faixa_rendimento_aux',
     resultField: 'income_range_id',
     where: {
         relation: '=',
         type: 'integer',
-        field: 'faixa_rendimento_aux_tx'
+        field: 'faixa_rendimento_aux'
     }
 }).addValue({
     name: 'gender',
@@ -544,26 +544,26 @@ function matchQueries(queryPartial, queryTotal) {
             newObj[key] = result[key];
         });
         let index = keys.indexOf('total');
-        if(index > -1) keys.splice(index, 1);
+        if (index > -1) keys.splice(index, 1);
         let objMatch = null;
 
-        for(let i = 0; i < queryPartial.length; ++i) {
+        for (let i = 0; i < queryPartial.length; ++i) {
             let partial = queryPartial[i];
             let foundMatch = true;
-            for(let j = 0; j < keys.length; ++j) {
+            for (let j = 0; j < keys.length; ++j) {
                 let key = keys[j];
-                if(partial[key] !== result[key]) {
+                if (partial[key] !== result[key]) {
                     foundMatch = false;
                     break;
                 }
             }
-            if(foundMatch) {
+            if (foundMatch) {
                 objMatch = partial;
                 break;
             }
         }
 
-        if(objMatch) {
+        if (objMatch) {
             newObj.denominator = result.total;
             newObj.partial = objMatch.total;
             newObj.total = (objMatch.total / result.total) * 100;
@@ -576,10 +576,10 @@ function matchQueries(queryPartial, queryTotal) {
 
 basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     req.querySet = [];
-    
+
     // Subquery para total_pop_maior_19 com filtros dinâmicos
     let totalPopMaior19 = req.sql.clone();
-        totalPopMaior19.from("pnad_novo")
+    totalPopMaior19.from("pnad_novo")
         .field("ano_ref", "year")
         .field("SUM(peso_domicilio_pessoas_com_cal)", "total")
         .where("idade_morador_31_03 >= 19")
@@ -589,7 +589,7 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
 
     // Subquery para total_pop_ed_bas_maior_19 com filtros dinâmicos
     let totalPopEdBasMaior19 = req.sql.clone();
-        totalPopEdBasMaior19.from("pnad_novo")
+    totalPopEdBasMaior19.from("pnad_novo")
         .field("ano_ref", "year")
         .field("SUM(peso_domicilio_pessoas_com_cal)", "total")
         .where("idade_morador_31_03 >= 19")
@@ -598,11 +598,6 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
         .group("ano_ref")
         .order("ano_ref");
 
-    if (req.query.dims && req.query.dims.includes("income_range")) {
-        totalPopMaior19.where("faixa_rendimento_aux_tx is not null");
-        totalPopEdBasMaior19.where("faixa_rendimento_aux_tx is not null");
-    }
-
     if (req.query.dims && req.query.dims.includes("cap_code")) {
         totalPopMaior19.where("cod_cap < 99");
     }
@@ -612,10 +607,10 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
 
     next();
 }, multiQuery, (req, res, next) => {
-        // The multiple requests are made. Then we need to calculate the percetange. So the function
-        // below is used
-        let newObj = matchQueries(req.result[0], req.result[1]);
-        req.result = newObj;
+    // The multiple requests are made. Then we need to calculate the percetange. So the function
+    // below is used
+    let newObj = matchQueries(req.result[0], req.result[1]);
+    req.result = newObj;
     next();
 }, id2str.transform(false), response('basic_education_conclusion'));
 
-- 
GitLab


From 07cad15f7de076317d6bf05d8ce0ae5a1171c56f Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Fri, 21 Mar 2025 11:10:55 -0300
Subject: [PATCH 6/6] feat: add cap_code and metro_code endpoints; update
 income_range field reference

---
 src/libs/routes_v1/adjustedLiquidFrequency.js | 62 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/libs/routes_v1/adjustedLiquidFrequency.js b/src/libs/routes_v1/adjustedLiquidFrequency.js
index 5b79740d..0be735c8 100644
--- a/src/libs/routes_v1/adjustedLiquidFrequency.js
+++ b/src/libs/routes_v1/adjustedLiquidFrequency.js
@@ -62,6 +62,34 @@ adjustedLiquidFrequency.get('/income_range', (req, res, next) => {
     next();
 }, response('income_range'));
 
+adjustedLiquidFrequency.get('/cap_code', (req, res, next) => {
+    req.result = []
+    for (let i = 11; i < 54; i++) {
+        if (id2str.capitalCode(i) !== 'Não informado') {
+        req.result.push({
+            id: i, name: id2str.capitalCode(i)
+        });
+        }
+    }
+    req.result.push({id: 99, name: id2str.capitalCode(99)});
+
+    next();
+}, response('cap_code'));
+
+adjustedLiquidFrequency.get('/metro_code', (req, res, next) => {
+    req.result = []
+    for (let i = 13; i < 53; i++) {
+        if (id2str.metroCode(i) !== 'Não informado') {
+        req.result.push({
+            id: i, name: id2str.metroCode(i)
+        });
+        }
+    }
+    req.result.push({id: 99, name: id2str.metroCode(99)});
+
+    next();
+}, response('metro_code'));
+
 adjustedLiquidFrequency.get('/gender', (req, res, next) => {
     req.result = []
     for (let i = 1; i < 3; i++) {
@@ -152,6 +180,16 @@ rqf.addField({
         foreign: 'cod_uf',
         foreignTable: 'pnad_novo'
     }
+}).addValue({
+    name: 'cap_code',
+    table: 'pnad_novo',
+    tableField: 'cod_cap',
+    resultField: 'cap_code_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'cod_cap'
+    }
 }).addValue({
     name: 'bolsa_familia',
     table: 'pnad_novo',
@@ -175,12 +213,12 @@ rqf.addField({
 }).addValue({
     name: 'income_range',
     table: 'pnad_novo',
-    tableField: 'faixa_rendimento_aux_tx',
+    tableField: 'faixa_rendimento_aux',
     resultField: 'income_range_id',
     where: {
         relation: '=',
         type: 'integer',
-        field: 'faixa_rendimento_aux_tx'
+        field: 'faixa_rendimento_aux'
     }
 }).addValue({
     name: 'age_range_all',
@@ -202,6 +240,16 @@ rqf.addField({
         type: 'integer',
         field: 'sexo'
     }
+}).addValue({
+    name: 'metro_code',
+    table: 'pnad_novo',
+    tableField: 'cod_rm_ride',
+    resultField: 'metro_code_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'cod_rm_ride'
+    }
 }).addValue({
     name: 'region',
     table: 'pnad_novo',
@@ -293,7 +341,9 @@ adjustedLiquidFrequency.get('/', rqf.parse(), (req, res, next) => {
         ${dimensions.gender ? " AND total_pop.gender_id = pnad_novo.sexo" : ""}
         ${dimensions.bolsa_familia ? "AND total_pop.bolsa_familia_id = pnad_novo.recebeu_rendimentos_de_programa_bolsa_familia" : ""}
         ${dimensions.new_pnad_ethnic_group ? "AND total_pop.new_pnad_ethnic_group_id = pnad_novo.cor_raca" : ""}
-        ${dimensions.income_range ? "AND total_pop.income_range_id = pnad_novo.faixa_rendimento_aux_tx" : ""}
+        ${dimensions.income_range ? "AND total_pop.income_range_id = pnad_novo.faixa_rendimento_aux" : ""}
+        ${dimensions.cap_code ? "AND total_pop.cap_code_id = pnad_novo.cod_cap" : ""}
+        ${dimensions.metro_code ? "AND pnad_novo.cod_rm_ride <> 99 AND total_pop.metro_code_id = pnad_novo.cod_rm_ride" : ""}
     `
 
     // Subquery: total_apoio_freq
@@ -337,6 +387,12 @@ adjustedLiquidFrequency.get('/', rqf.parse(), (req, res, next) => {
     if (dimensions.income_range)
         mainQuery.field("total_apoio_freq.income_range_id")
 
+    if (dimensions.cap_code)
+        mainQuery.field("total_apoio_freq.cap_code_id")
+
+    if (dimensions.metro_code)
+        mainQuery.field("total_apoio_freq.metro_code_id")
+
     req.sql = mainQuery;    
 
     next();
-- 
GitLab