diff --git a/.gitignore b/.gitignore
index 8079ab204600047053b6b0c676388ae293e475fe..e71efa9fd7b138a798949ce410d9601b04b5cfb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ DockerfileAntigo
src/libs/db/postgres.js
docker-compose.yml
entrypoint.sh
+gulpfile*
gulpfile.template.js
gulpfile.babel.js
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/ageRange19to64.js b/src/libs/convert/ageRange19to64.js
new file mode 100644
index 0000000000000000000000000000000000000000..470208675967b09f129effcdfe114f7386a02219
--- /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/convert/expenses.js b/src/libs/convert/expenses.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d8ff384530c041b8471abd7397233046e72a05e
--- /dev/null
+++ b/src/libs/convert/expenses.js
@@ -0,0 +1,33 @@
+/*
+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 'Rede pública (anual)'
+ case 2:
+ return 'Rede pública (mensal)';
+ case 3:
+ return 'Rede pública e conveniada (anual)';
+ case 4:
+ return 'Rede pública e conveniada (mensal)';
+ }
+};
+
diff --git a/src/libs/convert/revenue.js b/src/libs/convert/revenue.js
index 18cfeb8c0e2cf05ba10a15e4e4801f0327562ddc..fb3c819ac639bf49ec12abcd4c0af2049e705e21 100644
--- a/src/libs/convert/revenue.js
+++ b/src/libs/convert/revenue.js
@@ -21,22 +21,12 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
module.exports = function regionCode(id) {
switch (id) {
case 1:
- return "Ano";
+ return 'Rede pública (anual)'
case 2:
- return "Nome Ente"
+ return 'Rede pública (mensal)';
case 3:
- return 'Receitas';
+ return 'Rede pública e conveniada (anual)';
case 4:
- return 'Matrículas Públicas';
- case 5:
- return 'Matrículas Públicas Mais Conveniada';
- case 6:
- return 'Receita Aluno Ano Pública'
- case 7:
- return 'Receita Aluno Mês Pública';
- case 8:
- return 'Receita Aluno Ano Pública Mais Conveniada';
- case 9:
- return 'Receita Aluno Mês Pública Mais Conveniada';
+ return 'Rede pública e conveniada (mensal)';
}
};
diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js
index 903fda039fd276f42346152906a1bce7bb12c37e..e004f653d6410bfe8fa1b95677b363e6cf31bcf9 100644
--- a/src/libs/middlewares/aggregateData.js
+++ b/src/libs/middlewares/aggregateData.js
@@ -36,6 +36,7 @@ const convert = {
total_doc: "totalDoc",
education_degree_entity: "educationDegreeEntity",
government_agreement: "governmentAgreement",
+ despesas_alunos: "expenses",
receitas: "revenue",
despesas: "studentCost"
}
@@ -65,12 +66,13 @@ function aggregateData(req, res, next) {
'post_graduation_entity',
'contract_type_entity',
'education_degree_entity',
+ 'despesas_alunos',
'receitas',
'despesas'
- ]
+ ];
+ const baseFields = ["school"]
let id;
const fields = req.query.dims.split(',');
- console.log(fields);
let currentAggregateField;
let currentNonAggregateField;
@@ -92,7 +94,9 @@ function aggregateData(req, res, next) {
if (currentNonAggregateField) {
data[`${currentNonAggregateField}_id`] = r[`${currentNonAggregateField}_id`];
- data[`${currentNonAggregateField}_name`] = id2str[convert[currentNonAggregateField]](r[`${currentNonAggregateField}_id`]);
+ data[`${currentNonAggregateField}_name`] = baseFields.includes(currentNonAggregateField)
+ ? r[`${currentNonAggregateField}_name`]
+ : id2str[convert[currentNonAggregateField]](r[`${currentNonAggregateField}_id`]);
}
newResult.push(data)
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 025bbb6b0007bc9aadf1558ca14ae380a11a0ecd..7cd8e0fce1074c56a010ff04cf8fd8ac2194cce3 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -128,9 +128,11 @@ 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`);
const ageRangeOutSchool = require(`${libs}/convert/ageRangePopSchool`);
+const ageRange19to64 = require(`${libs}/convert/ageRange19to64`);
const ids = {
gender_id: gender,
@@ -250,9 +252,11 @@ const ids = {
special_education_entity: specialEducationEntity,
total_doc: totalDoc,
education_degree_entity: educationDegreeEntity,
+ despesas_id: expenses,
receitas_id: revenue,
student_cost: studentCost,
- age_range_pop_school_id: ageRangePopSchool
+ age_range_pop_school_id: ageRangePopSchool,
+ age_range_19_to_64_id: ageRange19to64
};
function transform(removeId=false) {
@@ -395,7 +399,9 @@ module.exports = {
specialEducationEntity,
totalDoc,
educationDegreeEntity,
+ expenses,
revenue,
studentCost,
- ageRangePopSchool
+ ageRangePopSchool,
+ ageRange19to64
};
diff --git a/src/libs/routes_v1/activity.js b/src/libs/routes_v1/activity.js
index cb35c2de1e741d37ec860ecb142f8d499f1ab7c5..1cc63016c61d99caa6e262eefc1f9aa8423e365d 100644
--- a/src/libs/routes_v1/activity.js
+++ b/src/libs/routes_v1/activity.js
@@ -199,7 +199,6 @@ activityApp.put('/:id', passport.authenticate('bearer', { session: false }), aut
}
});
}
- console.log("TEste");
act.type = req.body.tipo || act.type;
act.title = req.body.titulo || act.title;
act.subtitle = req.body.subtitulo || act.subtitle;
diff --git a/src/libs/routes_v1/adjustedLiquidFrequency.js b/src/libs/routes_v1/adjustedLiquidFrequency.js
index 5b79740d1cee31efb2b14da8ca2977ca64e44dae..0be735c84092e02aabff330dddf3cc84b83f2b66 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();
diff --git a/src/libs/routes_v1/api.js b/src/libs/routes_v1/api.js
index 133d5f18662b099585b2e81aa87972275e7799ea..3fa49554da76ccd99017862e6b1f8b6f10d9f0fd 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`)
@@ -249,6 +253,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/basicEducationConclusion.js b/src/libs/routes_v1/basicEducationConclusion.js
index fb7452990b4a1be888247802cea0e9e424af606c..3b22f4d3a96eabb0fcd2987a93be342e14854373 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,12 +115,11 @@ 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)
+ });
}
}
- req.result.push({id: 99, name: id2str.capitalCode(99)});
next();
}, response('cap_code'));
@@ -129,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'));
@@ -148,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'));
@@ -159,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'));
@@ -190,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'));
@@ -201,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'));
@@ -212,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'));
@@ -223,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'));
@@ -237,21 +236,21 @@ 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'));
-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 +413,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',
@@ -426,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',
@@ -545,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;
@@ -577,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")
@@ -590,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")
@@ -599,9 +598,8 @@ 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");
}
req.querySet.push(totalPopEdBasMaior19);
@@ -609,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'));
diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js
index 7e8cd3faece61c7999d16db913c50938de4e51fb..a561f1376599a397d14f1c0687814670c9bb4d39 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/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
diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js
index 5bfb7b8a23e5badace6614815f84ba4ae40515b3..e9549404d6f369410b8e9d3c7558bcaa91a8e798 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/studentCost.js b/src/libs/routes_v1/studentCost.js
index fdcf7270790bfcf1c50d26386a76f3196ccc7aa9..74aa91a237fee93b5db8dd6b819b711ab96018f2 100644
--- a/src/libs/routes_v1/studentCost.js
+++ b/src/libs/routes_v1/studentCost.js
@@ -51,6 +51,14 @@ studentCostApp.get('/years', (req, res, next) => {
next();
}, query, response('years'));
+studentCostApp.get('/type', (req, res, next) => {
+ req.result = []
+
+ req.result.push({ id: 1, name: "Rede Estadual" });
+ req.result.push({ id: 2, name: "Rede Municipal" });
+ next();
+}, response('type'));
+
rqf.addField({
name: 'filter',
field: false,
@@ -98,8 +106,10 @@ rqf.addField({
studentCostApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if (req.query.dims && req.query.dims.includes('despesas')) {
+ let obj = {};
let whereCondition = req.query.filter.includes("region") ? "" : "despesas.cod_ibge = 0";
let filterId;
+ let typeFilter = false;
const filters = req.query.filter.split(",");
filters.forEach((filter) => {
if (filter.includes("state") || filter.includes("city")) {
@@ -108,20 +118,29 @@ studentCostApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
}
})
- 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.cod_ibge')
- .order('despesas.ano_censo')
+ if (req.query.filter) {
+ const jsonString = `{${req.query.filter.replace(/(\w+):/g, '"$1":')}}`;
+ obj = JSON.parse(jsonString);
+ if (obj.type) {
+ if (obj.type.includes("1") && !obj.type.includes("2"))
+ whereCondition = "despesas.cod_ibge >= 11 and despesas.cod_ibge <= 53"
+ else if (obj.type.includes("2") && !obj.type.includes("1"))
+ whereCondition = "despesas.cod_ibge > 53"
+
+ typeFilter = true;
+ }
+ }
+
+ if (!typeFilter || (typeFilter && (!obj.state && !obj.city && !obj.region))) {
+ req.sql.from('despesas')
+ .field('despesas.ano_censo', 'year')
+ .field('SUM(gasto_aluno_ano_publica)', 'total_gasto_aluno_ano_publica')
+ .field('SUM(gasto_aluno_mes_publica)', 'total_gasto_aluno_mes_publica')
+ .field('SUM(gasto_aluno_ano_publica_mais_conveniada)', 'total_gasto_aluno_ano_publica_mais_conveniada')
+ .field('SUM(gasto_aluno_mes_publica_mais_conveniada)', 'total_gasto_aluno_mes_publica_mais_conveniada')
+ .where(`${whereCondition}`)
+ .group('despesas.ano_censo')
+ }
}
next();
diff --git a/src/libs/routes_v1/studentRevenue.js b/src/libs/routes_v1/studentRevenue.js
index b595fb0086846cef7c7b058abbc34ab23006ceca..271566af3a7fc1ebe53641a7889161c03d601d0c 100644
--- a/src/libs/routes_v1/studentRevenue.js
+++ b/src/libs/routes_v1/studentRevenue.js
@@ -36,9 +36,9 @@ const aggregateData = require(`${libs}/middlewares/aggregateData`);
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,11 +46,19 @@ studentRevenueApp.use(cache('15 day'));
studentRevenueApp.get('/years', (req, res, next) => {
req.sql.from('receitas')
- .field('DISTINCT receitas.ano', 'year')
- .where('receitas.ano is not null')
+ .field('DISTINCT receitas.ano', 'year')
+ .where('receitas.ano is not null')
next();
}, query, response('years'));
+studentRevenueApp.get('/type', (req, res, next) => {
+ req.result = []
+
+ req.result.push({ id: 1, name: "Rede Estadual" });
+ req.result.push({ id: 2, name: "Rede Municipal" });
+ next();
+}, response('type'));
+
rqf.addField({
name: 'filter',
field: false,
@@ -96,9 +104,12 @@ rqf.addField({
}
})
-studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if (req.query.dims && req.query.dims.includes('receitas')) {
+ let obj = {};
let whereCondition = req.query.filter.includes("region") ? "" : "receitas.cod_ibge = 0";
+
+ let typeFilter = false;
let filterId;
const filters = req.query.filter.split(",");
filters.forEach((filter) => {
@@ -108,20 +119,28 @@ studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
}
})
- req.sql.from('receitas')
- .field('receitas.ano', 'year')
- .field('receitas.ano', 'total_ano')
- .field('receitas.nome_ente', 'total_nome_ente')
- .field('receitas.receitas', 'total_receitas')
- .field('matriculas_publica', 'total_matriculas_publica')
- .field('matriculas_publicas_mais_conveniada', 'total_matriculas_publicas_mais_conveniada')
- .field('receuta_aluno_ano_publica', 'total_receita_aluno_ano_publica')
- .field('receita_aluno_mes_publica', 'total_receita_aluno_mes_publica')
- .field('receita_aluno_ano_publica_mais_conveniada', 'total_receita_aluno_ano_publica_mais_conveniada')
- .field('receita_aluno_mes_publica_mais_conveniada', 'total_receita_aluno_mes_publica_mais_conveniada')
- .where(`${whereCondition}`)
- .order('receitas.cod_ibge')
- .order('receitas.ano')
+ if (req.query.filter) {
+ const jsonString = `{${req.query.filter.replace(/(\w+):/g, '"$1":')}}`;
+ obj = JSON.parse(jsonString);
+ if (obj.type) {
+ if (obj.type.includes("1") && !obj.type.includes("2"))
+ whereCondition = "receitas.cod_ibge >= 11 and receitas.cod_ibge <= 53"
+ else if (obj.type.includes("2") && !obj.type.includes("1"))
+ whereCondition = "receitas.cod_ibge > 53"
+
+ typeFilter = true;
+ }
+ }
+ if (!typeFilter || (typeFilter && (!obj.state && !obj.city && !obj.region))) {
+ req.sql.from('receitas')
+ .field('receitas.ano', 'year')
+ .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')
+ .field('SUM(receita_aluno_mes_publica_mais_conveniada)', 'total_receita_aluno_mes_publica_mais_conveniada')
+ .where(`${whereCondition}`)
+ .group('receitas.ano')
+ }
}
next();