diff --git a/src/libs/convert/revenue.js b/src/libs/convert/revenue.js new file mode 100644 index 0000000000000000000000000000000000000000..9278e280d97d253fe57a91cb45314ad57d3a0775 --- /dev/null +++ b/src/libs/convert/revenue.js @@ -0,0 +1,40 @@ +/* +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 'Receitas'; + case 3: + return 'MatrÃculas Públicas'; + case 4: + return 'MatrÃculas Públicas Mais Conveniada'; + case 5: + return 'Receita Aluno Ano Pública' + case 6: + return 'Receita Aluno Mês Pública'; + case 7: + return 'Receita Aluno Ano Pública Mais Conveniada'; + case 8: + return 'Receita Aluno Mês Pública Mais Conveniada'; + } +}; diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js index eed373ddbbfd98c4a30fc4615823bb5d91a01fc4..cbe55d8c7d075fc66ad98d20b28deb6e1f76c3a6 100644 --- a/src/libs/middlewares/aggregateData.js +++ b/src/libs/middlewares/aggregateData.js @@ -35,7 +35,8 @@ const convert = { contract_type_entity: 'contractType', total_doc: "totalDoc", education_degree_entity: "educationDegreeEntity", - government_agreement: "governmentAgreement" + government_agreement: "governmentAgreement", + receitas: "revenue" } function aggregateData(req, res, next) { @@ -62,7 +63,8 @@ function aggregateData(req, res, next) { 'age_range_entity', 'post_graduation_entity', 'contract_type_entity', - 'education_degree_entity' + 'education_degree_entity', + 'receitas' ] let id; const fields = req.query.dims.split(','); diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js index d6c763c9e3d281b3763c8be632d1b4dca5a0e78f..60ff424f8c0599499d6a7e3cf559a4ab1a595049 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 revenue = require(`${libs}/convert/revenue`); 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, + receitas_id: revenue }; function transform(removeId=false) { @@ -386,5 +388,6 @@ module.exports = { postGraduationEntity, specialEducationEntity, totalDoc, - educationDegreeEntity + educationDegreeEntity, + revenue }; diff --git a/src/libs/middlewares/studentRevenueParser.js b/src/libs/middlewares/studentRevenueParser.js new file mode 100644 index 0000000000000000000000000000000000000000..954c9c8208d7349b104bdc5355e2bddb96a3498a --- /dev/null +++ b/src/libs/middlewares/studentRevenueParser.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 studentRevenueParser(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/routes_v1/api.js b/src/libs/routes_v1/api.js index 9bbd5e93fd8a24b661e1686a63ee854edd884253..843060180a8ade07714fc6965b16049f2420d797 100644 --- a/src/libs/routes_v1/api.js +++ b/src/libs/routes_v1/api.js @@ -173,6 +173,9 @@ const adjustedLiquidFrequency = require(`${libs}/routes_v1/adjustedLiquidFrequen const iliteracyRate = require(`${libs}/routes_v1/iliteracyRate`); +const studentRevenue = require(`${libs}/routes_v1/studentRevenue`); +const studentRevenueParser = require(`${libs}/middlewares/studentRevenueParser`); + api.get('/', (req, res) => { res.json({ msg: 'SimCAQ API v1 is running' }); }); @@ -247,6 +250,7 @@ api.use('/superior_education_conclusion_tax', superiorEducationConclusionTax) api.use('/basic_education_conclusion', basicEducationConclusion); api.use('/adjusted_liquid_frequency', adjustedLiquidFrequency); api.use('/iliteracy_rate', iliteracyRate); +api.use('/student_revenue', studentRevenueParser, studentRevenue); //Publication api.use('/publication', publication); diff --git a/src/libs/routes_v1/studentRevenue.js b/src/libs/routes_v1/studentRevenue.js new file mode 100644 index 0000000000000000000000000000000000000000..4b8c334e97679326bbb6644c413e55d285fd0c54 --- /dev/null +++ b/src/libs/routes_v1/studentRevenue.js @@ -0,0 +1,128 @@ +/* +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 studentRevenueApp = 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 aggregateData = require(`${libs}/middlewares/aggregateData`); + +const id2str = require(`${libs}/middlewares/id2str`); + +const config = require(`${libs}/config`); + +const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware; + +let rqf = new ReqQueryFields(); + +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') + next(); +}, query, response('years')); + +rqf.addField({ + name: 'filter', + field: false, + where: true +}).addField({ + name: 'dims', + field: true, + where: false +}).addValue({ + name: 'min_year', + table: 'receitas', + tableField: 'ano', + resultField: 'year', + where: { + relation: '>=', + type: 'integer', + field: 'ano' + } +}).addValue({ + name: 'max_year', + table: 'receitas', + tableField: 'ano', + resultField: 'year', + where: { + relation: '<=', + type: 'integer', + field: 'ano' + } +}).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: 'receitas' + } +}) + +studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { + if (req.query.dims && req.query.dims.includes('receitas')) { + let whereCondition = req.query.filter.includes("region") ? "" : "receitas.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 = `receitas.cod_ibge = ${filterId}` + } + }) + + req.sql.from('receitas') + .field('receitas.ano', 'year') + .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') + } + + next(); +}, query, aggregateData, id2str.transform(false), response('student_revenue')); + +module.exports = studentRevenueApp; diff --git a/src/libs/routes_v1/yearsOfStudy.js b/src/libs/routes_v1/yearsOfStudy.js index 0a84f206e9fedd82cb24286b5adfaf2ae198b6d6..a87d833ada08033abb2c7925d7f0c0b8bf33e636 100644 --- a/src/libs/routes_v1/yearsOfStudy.js +++ b/src/libs/routes_v1/yearsOfStudy.js @@ -538,7 +538,7 @@ PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { req.sql.from('pnad_novo') .field('pnad_novo.ano_ref', 'year') - .field('media.media_anos_estudo', 'mean') + .field('media.media_anos_estudo', 'average') .field('SQRT(SUM(POWER(pnad_novo.anos_de_estudo - media.media_anos_estudo, 2) * pnad_novo.peso_domicilio_pessoas_com_cal) / SUM(pnad_novo.peso_domicilio_pessoas_com_cal))', 'std_dev') .join(mean, 'media', joinQuery) .where('pnad_novo.ano_ref >= 2019 AND pnad_novo.faixa_etaria >= 6 AND pnad_novo.anos_de_estudo <> 99')