diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..85266ff985a71c7c1d0a0933785b77be4d3d3c3d
--- /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 0000000000000000000000000000000000000000..04db51922c7afe6455aa25ef452e79ead0cd5751
--- /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 7c8b741852d94433abf9034871069a8d0594e315..10a79259259599fffb7209ce6c131286a3c17d80 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,18 @@ 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 0000000000000000000000000000000000000000..3de679df0c18e307b692cb22a3cb6446c052fcaf
--- /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 0000000000000000000000000000000000000000..5cd28c4e6b7f17a89f35efcdd36d6b04c7af4322
--- /dev/null
+++ b/src/libs/convert/expenses.js
@@ -0,0 +1,43 @@
+/*
+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 "Ano";
+ case 2:
+ return "Entidade";
+ case 3:
+ return 'Despesas';
+ case 4:
+ return 'MatrÃculas Públicas';
+ case 5:
+ return 'MatrÃculas Públicas Mais Conveniada';
+ case 6:
+ return 'Despesas Aluno Ano Pública'
+ case 7:
+ return 'Despesas Aluno Mês Pública';
+ case 8:
+ 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/aggregateData.js b/src/libs/middlewares/aggregateData.js
index ab7dfdd957843df41e5fffabbad43b579d36fe51..fccb74536de9554df44ffad51d6d931dd70ccbb1 100644
--- a/src/libs/middlewares/aggregateData.js
+++ b/src/libs/middlewares/aggregateData.js
@@ -36,11 +36,13 @@ const convert = {
total_doc: "totalDoc",
education_degree_entity: "educationDegreeEntity",
government_agreement: "governmentAgreement",
+ despesas_alunos: "expenses",
receitas: "revenue",
despesas: "studentCost"
}
function aggregateData(req, res, next) {
+ console.log("Teste if agg");
if (req.query.dims) {
const newResult = []
const aggregateFields = [
@@ -65,6 +67,7 @@ function aggregateData(req, res, next) {
'post_graduation_entity',
'contract_type_entity',
'education_degree_entity',
+ 'despesas_alunos',
'receitas',
'despesas'
];
@@ -75,9 +78,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 0000000000000000000000000000000000000000..5ba0c8eb2e9e9bbe9966d0aabb1af7c3c187088c
--- /dev/null
+++ b/src/libs/middlewares/expensesParser.js
@@ -0,0 +1,21 @@
+/*
+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) {
+ 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 730d620e18c1bc1708af165eebd5de1b3a54c931..b357f61ba3471171df63652ee04e77a0ad9abc6f 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 revenue = require(`${libs}/convert/revenue`);
const studentCost = require(`${libs}/convert/studentCost`);
@@ -247,6 +248,7 @@ const ids = {
special_education_entity: specialEducationEntity,
total_doc: totalDoc,
education_degree_entity: educationDegreeEntity,
+ despesas_id: expenses,
receitas_id: revenue,
student_cost: studentCost
};
@@ -391,6 +393,7 @@ module.exports = {
specialEducationEntity,
totalDoc,
educationDegreeEntity,
+ expenses,
revenue,
studentCost
};
diff --git a/src/libs/routes_v1/api.js b/src/libs/routes_v1/api.js
index 5331b389e96c49e06b8ee0df8b8868be68f2422a..041e0b382fc7a497ee19aae27bec5c84f7d80af1 100644
--- a/src/libs/routes_v1/api.js
+++ b/src/libs/routes_v1/api.js
@@ -155,7 +155,11 @@ const federativeEntity = require(`${libs}/routes_v1/federativeEntity`);
const email = require(`${libs}/routes_v1/email`);
-const uniLocalOfferAggregate = require(`${libs}/routes_v1/uniLocalOfferAggregate`)
+const uniLocalOfferAggregate = require(`${libs}/routes_v1/uniLocalOfferAggregate`);
+
+const expenses = require(`${libs}/routes_v1/expenses`);
+
+const expensesParser = require(`${libs}/middlewares/expensesParser`);
const yearsOfStudy = require(`${libs}/routes_v1/yearsOfStudy`)
@@ -246,6 +250,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);
api.use('/years_of_study', yearsOfStudy)
api.use('/students_receiving_aid_tax', studentsReceivingAidTax);
api.use('/superior_education_conclusion_tax', superiorEducationConclusionTax)
diff --git a/src/libs/routes_v1/expenses.js b/src/libs/routes_v1/expenses.js
new file mode 100644
index 0000000000000000000000000000000000000000..3624865994bd1cf60e35a6ccdcac3c28df0383b7
--- /dev/null
+++ b/src/libs/routes_v1/expenses.js
@@ -0,0 +1,143 @@
+/*
+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}`
+ }
+ })
+
+ 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')
+ .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.ano_censo')
+ }
+
+ next();
+}, query, aggregateData, id2str.transform(false), response('expenses'));
+
+module.exports = ExpensesApp;
\ No newline at end of file