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/2] [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 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 2/2] =?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