From 9e0225bbdfa350d29f551d3f8ee2adec46d0fc75 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Wed, 28 Aug 2024 14:29:23 -0300
Subject: [PATCH 1/5] Add federative entity route

---
 .../convert/educationLevelModEntityAgg.js     |  56 ++
 .../convert/educationLevelModEntitySeg.js     |  40 ++
 src/libs/middlewares/aggregateData.js         |   8 +-
 src/libs/middlewares/id2str.js                |  11 +-
 src/libs/routes_v1/api.js                     |   3 +
 src/libs/routes_v1/federativeEntity.js        | 542 ++++++++++++++++++
 6 files changed, 655 insertions(+), 5 deletions(-)
 create mode 100644 src/libs/convert/educationLevelModEntityAgg.js
 create mode 100644 src/libs/convert/educationLevelModEntitySeg.js
 create mode 100644 src/libs/routes_v1/federativeEntity.js

diff --git a/src/libs/convert/educationLevelModEntityAgg.js b/src/libs/convert/educationLevelModEntityAgg.js
new file mode 100644
index 00000000..a9fb4fbc
--- /dev/null
+++ b/src/libs/convert/educationLevelModEntityAgg.js
@@ -0,0 +1,56 @@
+/*
+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 educationLevelShort(id) {
+    switch (id) {
+        case 1:
+        return 'Creche';
+        case 2:
+        return 'Pré-Escola';
+        case 3:
+        return 'Ensino Fundamental - anos iniciais';
+        case 4:
+        return 'Ensino Fundamental - anos finais';
+        case 5:
+        return 'Ensino Médio Propedêutico';
+        case 6:
+        return 'Ensino Médio Normal Magistério';
+        case 7:
+        return 'Ensino Médio Integrado';
+        case 8:
+        return 'Educação Profissional Técnica - Associado ao Nível Médio';
+        case 9:
+        return 'Educação Profissional Técnica - Concomitante';
+        case 10:
+        return 'Educação Profissional Técnica - Subsequente';
+        case 11:
+        return 'Educação Profissional - Misto';
+        case 12:
+        return 'Educação Profissional FIC Concomitante';
+        case 13:
+        return 'Educacao Profissional FIC Integrado EJA';
+        case 14:
+        return 'EJA Ensino Fundamental';
+        case 15:
+        return 'EJA Ensino Médio';
+        default:
+        return 'Não classificada';
+    }
+};
diff --git a/src/libs/convert/educationLevelModEntitySeg.js b/src/libs/convert/educationLevelModEntitySeg.js
new file mode 100644
index 00000000..fedf7d56
--- /dev/null
+++ b/src/libs/convert/educationLevelModEntitySeg.js
@@ -0,0 +1,40 @@
+/*
+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 educationLevelShort(id) {
+    switch (id) {
+        case 1:
+        return 'Educação Infantil';
+        case 2:
+        return 'Ensino Fundamental';
+        case 3:
+        return 'Ensino Médio';
+        case 4:
+        return 'Educação Profissional';
+        case 5:
+        return 'Educação Profissional Técnica de Nível Médio';
+        case 6:
+        return 'Educação Profissional FIC';
+        case 7:
+        return 'EJA';
+        default:
+        return 'Não classificada';
+    }
+};
diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js
index 3ea93de3..4059a2f0 100644
--- a/src/libs/middlewares/aggregateData.js
+++ b/src/libs/middlewares/aggregateData.js
@@ -22,7 +22,9 @@ const convert = {
     modality_integral_time: 'educationLevelBasic',
     special_education: 'specialEducation',
     special_education_doc: 'specialEducationDoc',
-    education_level_mod_doc: 'educationLevelModDoc'
+    education_level_mod_doc: 'educationLevelModDoc',
+    education_level_mod_entity_seg: 'educationLevelModEntitySeg',
+    education_level_mod_entity_agg: 'educationLevelModEntityAgg'
 }
 
 function aggregateData(req, res, next) {
@@ -38,7 +40,9 @@ function aggregateData(req, res, next) {
             'period_agg', 
             'modality_integral_time', 
             'special_education',
-            'special_education_doc'
+            'special_education_doc',
+            'education_level_mod_entity_seg',
+            'education_level_mod_entity_agg'
         ]
         let id;
         const fields = req.query.dims.split(',');
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index 1971d0a0..d940606b 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -119,7 +119,8 @@ const ageRangeAggregate = require(`${libs}/convert/ageRangeAggregate`);
 const specialEducation = require(`${libs}/convert/specialEducation`);
 const specialEducationDoc = require(`${libs}/convert/specialEducationDoc`);
 const educationLevelModDoc = require(`${libs}/convert/educationLevelModDoc`);
-
+const educationLevelModEntitySeg = require(`${libs}/convert/educationLevelModEntitySeg`);
+const educationLevelModEntityAgg = require(`${libs}/convert/educationLevelModEntityAgg`);
 
 const ids = {
     gender_id: gender,
@@ -231,7 +232,9 @@ const ids = {
     income_range_id: incomeRange,
     special_education: specialEducation,
     special_education_doc: specialEducationDoc,
-    education_level_mod_doc: educationLevelModDoc
+    education_level_mod_doc: educationLevelModDoc,
+    education_level_mod_entity_seg: educationLevelModEntitySeg,
+    education_level_mod_entity_agg: educationLevelModEntityAgg
 };
 
 function transform(removeId=false) {
@@ -365,5 +368,7 @@ module.exports = {
     incomeRange,
     specialEducation,
     specialEducationDoc,
-    educationLevelModDoc
+    educationLevelModDoc,
+    educationLevelModEntitySeg,
+    educationLevelModEntityAgg
 };
diff --git a/src/libs/routes_v1/api.js b/src/libs/routes_v1/api.js
index ba036951..e9fbd8fd 100644
--- a/src/libs/routes_v1/api.js
+++ b/src/libs/routes_v1/api.js
@@ -149,6 +149,8 @@ const enrollmentAggregate = require(`${libs}/routes_v1/enrollmentAggregate`);
 
 const employeesAggregate = require(`${libs}/routes_v1/employeesAggregate`);
 
+const federativeEntity = require(`${libs}/routes_v1/federativeEntity`);
+
 const email = require(`${libs}/routes_v1/email`);
 
 api.get('/', (req, res) => {
@@ -214,6 +216,7 @@ api.use('/new_pnad', newPnad);
 api.use('/rate_school_new', rateSchoolNew)
 api.use('/enrollmentAggregate', enrollmentAggregate);
 api.use('/employeesAggregate', employeesAggregate);
+api.use('/federativeEntity', federativeEntity);
 
 
 //Publication 
diff --git a/src/libs/routes_v1/federativeEntity.js b/src/libs/routes_v1/federativeEntity.js
new file mode 100644
index 00000000..df39c381
--- /dev/null
+++ b/src/libs/routes_v1/federativeEntity.js
@@ -0,0 +1,542 @@
+/*
+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/>.
+*/
+
+const express = require('express');
+const { result } = require('lodash');
+
+const federativeEntityApp = express.Router();
+
+const libs = `${process.cwd()}/libs`;
+
+const log = require(`${libs}/log`)(module);
+
+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 addMissing = require(`${libs}/middlewares/addMissing`);
+
+const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
+
+federativeEntityApp.use(cache('15 day'));
+
+let rqf = new ReqQueryFields();
+
+federativeEntityApp.get('/years', (req, res, next) => {
+    req.sql.from('escola')
+    .field('DISTINCT escola.ano_censo', 'year')
+    .where('escola.ano_censo >= 2021')
+    next();
+}, query, response('years'));
+
+federativeEntityApp.get('/adm_dependency', (req, res, next) => {
+    req.result = []
+
+    for (let i = 1; i <= 5; i++) {
+        req.result.push({
+            id: i, name: id2str.admDependency(i)
+        });
+    }
+    next();
+}, response('adm_dependency'));
+
+federativeEntityApp.get('/adm_dependency_detailed', (req, res, next) => {
+    req.result = []
+
+    for (let i = 1; i <= 9; i++) {
+        req.result.push({
+            id: i, name: id2str.admDependencyPriv(i)
+        });
+    }
+    next();
+}, response('adm_dependency_detailed'));
+
+federativeEntityApp.get('/education_level_mod_agg', (req, res, next) => {
+    req.result = []
+
+    for (let i = 1; i <= 13; i++) {
+        req.result.push({
+            id: i, name: id2str.educationLevelMod(i)
+        });
+    }
+    next();
+}, response('education_level_mod_agg'));
+
+federativeEntityApp.get('/integral_time_agg', (req, res, next) => {
+    req.result = []
+
+    for (let i = 0; i <= 3; i++) {
+        req.result.push({
+            id: i, name: id2str.integralTime(i)
+        });
+    }
+    next();
+}, response('integral_time_agg')); 
+
+federativeEntityApp.get('/location', (req, res, next) => {
+    req.result = []
+
+    for (let i = 1; i <= 2; i++) {
+        req.result.push({
+            id: i, name: id2str.location(i)
+        });
+    }
+    next();
+}, response('location'));
+
+federativeEntityApp.get('/diff_location', (req, res, next) => {
+    req.result = []
+
+    for (let i = 0; i <= 4; i++) {
+        req.result.push({
+            id: i, name: id2str.diffLocation(i)
+        });
+    }
+
+    req.result.push({
+        id: 8, name: 'Área onde se localizam povos e comunidades tradicionais'
+    })
+
+    next();
+}, response('diff_location'));
+
+federativeEntityApp.get('/modality_integral_time', (req, res, next) => {
+    req.result = []
+
+    for (let i = 0; i <= 7; i++) {
+        req.result.push({
+            id: i, name: id2str.educationLevelBasic(i)
+        });
+    }
+
+    next();
+}, response('modality_integral_time'));
+
+federativeEntityApp.get('/gender', (req, res, next) => {
+    req.result = []
+
+    for (let i = 1; i <= 2; i++) {
+        req.result.push({
+            id: i, name: id2str.gender(i)
+        });
+    }
+
+    next();
+}, response('gender'));
+
+federativeEntityApp.get('/age_range', (req, res, next) => {
+    req.result = []
+
+    for (let i = 1; i <= 7; i++) {
+        req.result.push({
+            id: i, name: id2str.ageRangeAggregate(i)
+        });
+    }
+
+    next();
+}, response('age_range'));
+
+federativeEntityApp.get('/ethnic_group', (req, res, next) => {
+    req.result = []
+
+    for (let i = 0; i <= 6; i++) {
+        req.result.push({
+            id: i, name: id2str.ethnicGroup(i)
+        });
+    }
+
+    next();
+}, response('ethnic_group'));
+
+federativeEntityApp.get('/period_agg', (req, res, next) => {
+    req.result = []
+
+    for (let i = 0; i <= 5; i++) {
+        req.result.push({
+            id: i, name: id2str.period(i)
+        });
+    }
+
+    next();
+}, response('period_agg'));
+
+federativeEntityApp.get('/region', (req, res, next) => {
+    req.result = []
+
+    for (let i = 0; i <= 5; i++) {
+        req.result.push({
+            id: i, name: id2str.regionCode(i)
+        });
+    }
+
+    next();
+}, response('period_agg'));
+
+federativeEntityApp.get('/state', (req, res, next) => {
+    req.result = []
+    for (let i = 11; i < 54; i++) {
+        if (id2str.stateName(i) !== 'Não declarada') {
+            req.result.push({
+                id: i, name: id2str.stateName(i)
+            });
+        }
+    }
+
+    next();
+}, response('state'));
+
+federativeEntityApp.get('/special_education', (req, res, next) => {
+    req.result = []
+
+    for (let i = 1; i <= 2; i++) {
+        req.result.push({
+            id: i, name: id2str.specialEducation(i)
+        });
+    }
+
+    next();
+}, response('special_education'));
+
+
+rqf.addField({
+    name: 'filter',
+    field: false,
+    where: true
+}).addField({
+    name: 'dims',
+    field: true,
+    where: false
+}).addValue({
+    name: 'adm_dependency',
+    table: 'escola',
+    tableField: 'dependencia_adm_id',
+    resultField: 'adm_dependency_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'dependencia_adm_id'
+    }
+}).addValue({
+    name: 'adm_dependency_detailed',
+    table: 'escola',
+    tableField: 'dependencia_adm_priv',
+    resultField: 'adm_dependency_detailed_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'dependencia_adm_priv'
+    }
+}).addValue({
+    name: 'education_level_mod',
+    table: 'escola',
+    tableField: 'etapas_mod_ensino_segmento_id',
+    resultField: 'education_level_mod_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'etapas_mod_ensino_segmento_id'
+    }
+}).addValue({
+    name:'integral_time',
+    table: 'escola',
+    tableField: 'tempo_integral',
+    resultField: 'integral_time_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'tempo_integral'
+    }
+  }).addValue({
+    name: 'education_level_short',
+    table: 'escola',
+    tableField: 'etapa_resumida',
+    resultField: 'education_level_short_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'etapa_resumida'
+    }
+}).addValue({
+    name: 'region',
+    table: 'regiao',
+    tableField: ['nome', 'id'],
+    resultField: ['region_name', 'region_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: 'id',
+        foreign: 'regiao_id',
+        foreignTable: 'escola'
+    }
+}).addValue({
+    name: 'mesoregion',
+    table: 'municipio',
+    tableField: ['nome_mesorregiao', 'mesorregiao_id'],
+    resultField: ['mesoregion_name', 'mesoregion_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'mesorregiao_id',
+        table: 'municipio'
+    },
+    join: {
+        primary: 'id',
+        foreign: 'municipio_id',
+        foreignTable: 'escola'
+    }
+}).addValue({
+    name: 'microregion',
+    table: 'municipio',
+    tableField: ['nome_microrregiao', 'microrregiao_id'],
+    resultField: ['microregion_name', 'microregion_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'microrregiao_id',
+        table: 'municipio'
+    },
+    join: {
+        primary: 'id',
+        foreign: 'municipio_id',
+        foreignTable: 'escola'
+    }
+}).addValue({
+    name: 'min_year',
+    table: 'escola',
+    tableField: 'ano_censo',
+    resultField: 'year',
+    where: {
+        relation: '>=',
+        type: 'integer',
+        field: 'ano_censo',
+    },
+}).addValue({
+    name: 'max_year',
+    table: 'escola',
+    tableField: 'ano_censo',
+    resultField: 'year',
+    where: {
+        relation: '<=',
+        type: 'integer',
+        field: 'ano_censo',
+    },
+}).addValueToField({
+    name: 'state',
+    table: 'estado',
+    tableField: ['nome', 'id'],
+    resultField: ['state_name', 'state_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: 'id',
+        foreign: 'estado_id',
+        foreignTable: 'escola'
+    }
+}, 'dims').addValueToField({
+    name: 'state',
+    table: 'estado',
+    tableField: 'nome',
+    resultField: 'state_name',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: 'id',
+        foreign: 'estado_id',
+        foreignTable: 'escola'
+    }
+}, 'filter').addValueToField({
+    name: 'city',
+    table: 'municipio',
+    tableField: ['nome', 'id'],
+    resultField: ['city_name', 'city_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: 'id',
+        foreign: 'municipio_id',
+        foreignTable: 'escola'
+    }
+}, 'dims').addValueToField({
+    name: 'city',
+    table: 'municipio',
+    tableField: 'nome',
+    resultField: 'city_name',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: 'id',
+        foreign: 'municipio_id',
+        foreignTable: 'escola'
+    }
+}, 'filter').addValueToField({
+    name: 'school',
+    table: 'escola',
+    tableField: ['nome_escola', 'id'],
+    resultField: ['school_name', 'school_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: ['id', 'ano_censo'],
+        foreign: ['escola_id', 'ano_censo'],
+        foreignTable: 'escola'
+    }
+}, 'dims').addValueToField({
+    name: 'locale_id',
+    table: 'escola',
+    tableField: 'localizacao_id',
+    resultField: 'locale_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'localizacao_id'
+    }
+}, 'dims').addValueToField({
+    name: 'school_id',
+    table: 'escola',
+    tableField: 'id',
+    resultField: 'school_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: ['id', 'ano_censo'],
+        foreign: ['escola_id', 'ano_censo'],
+        foreignTable: 'escola'
+    }
+}, 'dims').addValueToField({
+    name: 'school',
+    table: 'escola',
+    tableField: 'nome_escola',
+    resultField: 'school_name',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: ['id', 'ano_censo'],
+        foreign: ['escola_id', 'ano_censo'],
+        foreignTable: 'escola'
+    }
+}, 'filter').addValue({
+    name: 'location',
+    table: 'escola',
+    tableField: 'localizacao_id',
+    resultField: 'location_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'localizacao_id'
+    }
+}).addValue({
+    name: 'diff_location',
+    table: 'escola',
+    tableField: 'localizacao_diferenciada_par',
+    resultField: 'diff_location_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'localizacao_diferenciada_par'
+    }
+});
+
+federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+
+    console.log(req.query);
+
+    if (req.query.dims && req.query.dims.includes('education_level_mod_entity_seg'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_ed_inf_total)', 'total_doc_ed_inf_total')
+        .field('SUM(docentes_sinopse.num_doc_en_fund_total)', 'total_doc_en_fund_total')
+        .field('SUM(docentes_sinopse.num_doc_en_medio_total)', 'total_doc_en_medio_total')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_total)', 'total_doc_ed_prof_total')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_tec_total)', 'total_doc_ed_prof_tec_total')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_fic_total)', 'total_doc_ed_prof_fic_total')
+        .field('SUM(docentes_sinopse.num_doc_eja_total)', 'total_doc_eja_total')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('education_level_mod_entity_agg'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_ed_inf_creche)', 'total_doc_ed_inf_creche')
+        .field('SUM(docentes_sinopse.num_doc_ed_inf_pre_escola)', 'total_doc_ed_inf_pre_escola')
+        .field('SUM(docentes_sinopse.num_doc_en_fund_anos_iniciais)', 'total_doc_en_fund_anos_iniciais')
+        .field('SUM(docentes_sinopse.num_doc_en_fund_anos_finais)', 'total_doc_en_fund_anos_finais')
+        .field('SUM(docentes_sinopse.num_doc_en_medio_propedeutico)', 'total_doc_en_medio_propedeutico')
+        .field('SUM(docentes_sinopse.num_doc_en_medio_normal_magisterio)', 'total_doc_en_medio_normal_magisterio')
+        .field('SUM(docentes_sinopse.num_doc_en_medio_integrado)', 'total_doc_en_medio_integrado')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_en_medio)', 'total_doc_ed_prof_en_medio')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_tec_concomitante)', 'total_doc_ed_prof_tec_concomitante')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_tec_subsequente)', 'total_doc_ed_prof_tec_subsequente')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_tec_misto)', 'total_doc_ed_prof_tec_misto')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_fic_concomitante)', 'total_doc_ed_prof_fic_concomitante')
+        .field('SUM(docentes_sinopse.num_doc_ed_prof_fic_integrado_eja)', 'total_doc_ed_prof_fic_integrado_eja')
+        .field('SUM(docentes_sinopse.num_doc_eja_en_fund)', 'total_doc_eja_en_fund')
+        .field('SUM(docentes_sinopse.num_doc_eja_en_medio)', 'total_doc_eja_en_medio')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.qt_mat_bas)', 'total')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo');
+    }
+    next();
+}, query, aggregateData, id2str.transform(false), response('federative_entity'));
+
+module.exports = federativeEntityApp;
-- 
GitLab


From f16154447d6e4b440fac4e97bcb5932c24230d53 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Fri, 30 Aug 2024 14:01:29 -0300
Subject: [PATCH 2/5] All aggregate data working

---
 src/libs/convert/ageRangeEntity.js       |  40 ++++++
 src/libs/convert/postGraduationEntity.js |  32 +++++
 src/libs/middlewares/aggregateData.js    |  18 ++-
 src/libs/middlewares/id2str.js           |  10 +-
 src/libs/routes_v1/federativeEntity.js   | 173 +++++++++++++----------
 5 files changed, 198 insertions(+), 75 deletions(-)
 create mode 100644 src/libs/convert/ageRangeEntity.js
 create mode 100644 src/libs/convert/postGraduationEntity.js

diff --git a/src/libs/convert/ageRangeEntity.js b/src/libs/convert/ageRangeEntity.js
new file mode 100644
index 00000000..f9ca149b
--- /dev/null
+++ b/src/libs/convert/ageRangeEntity.js
@@ -0,0 +1,40 @@
+/*
+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 ageRangeEntity(id) {
+    switch (id) {
+        case 1:
+        return 'Até 24 anos';
+        case 2:
+        return '25 a 29 anos';
+        case 3:
+        return '30 a 39 anos';
+        case 4:
+        return '40 a 49 anos';
+        case 5:
+        return '50 a 54 anos';
+        case 6:
+        return '55 a 59 anos';
+        case 7:
+        return '60 anos ou mais';
+        default:
+        return 'Não declarada';
+    }
+};
diff --git a/src/libs/convert/postGraduationEntity.js b/src/libs/convert/postGraduationEntity.js
new file mode 100644
index 00000000..49e8d08a
--- /dev/null
+++ b/src/libs/convert/postGraduationEntity.js
@@ -0,0 +1,32 @@
+/*
+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 ageRange(id) {
+    switch (id) {
+        case 1:
+        return 'Pós-Graduação Especialização';
+        case 2:
+        return 'Pós-Graduação Mestrado';
+        case 3:
+        return 'Pós-Graduação Doutorado';
+        default:
+        return '';
+    }
+};
diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js
index 4059a2f0..3dadee22 100644
--- a/src/libs/middlewares/aggregateData.js
+++ b/src/libs/middlewares/aggregateData.js
@@ -24,7 +24,14 @@ const convert = {
     special_education_doc: 'specialEducationDoc',
     education_level_mod_doc: 'educationLevelModDoc',
     education_level_mod_entity_seg: 'educationLevelModEntitySeg',
-    education_level_mod_entity_agg: 'educationLevelModEntityAgg'
+    education_level_mod_entity_agg: 'educationLevelModEntityAgg',
+    adm_dependency_entity_agg: 'newPnadAdmDependency',
+    adm_dependency_entity: 'admDependency',
+    location_entity: 'location',
+    gender_entity: 'gender',
+    age_range_entity: 'ageRangeEntity',
+    post_graduation_entity: 'postGraduationEntity',
+    contract_type_entity: 'contractType'
 }
 
 function aggregateData(req, res, next) {
@@ -42,7 +49,14 @@ function aggregateData(req, res, next) {
             'special_education',
             'special_education_doc',
             'education_level_mod_entity_seg',
-            'education_level_mod_entity_agg'
+            'education_level_mod_entity_agg',
+            'adm_dependency_entity_agg',
+            'adm_dependency_entity',
+            'location_entity',
+            'gender_entity',
+            'age_range_entity',
+            'post_graduation_entity',
+            'contract_type_entity'
         ]
         let id;
         const fields = req.query.dims.split(',');
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index d940606b..08a1ebed 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -121,6 +121,8 @@ const specialEducationDoc = require(`${libs}/convert/specialEducationDoc`);
 const educationLevelModDoc = require(`${libs}/convert/educationLevelModDoc`);
 const educationLevelModEntitySeg = require(`${libs}/convert/educationLevelModEntitySeg`);
 const educationLevelModEntityAgg = require(`${libs}/convert/educationLevelModEntityAgg`);
+const ageRangeEntity = require(`${libs}/convert/ageRangeEntity`);
+const postGraduationEntity = require(`${libs}/convert/postGraduationEntity`);
 
 const ids = {
     gender_id: gender,
@@ -234,7 +236,9 @@ const ids = {
     special_education_doc: specialEducationDoc,
     education_level_mod_doc: educationLevelModDoc,
     education_level_mod_entity_seg: educationLevelModEntitySeg,
-    education_level_mod_entity_agg: educationLevelModEntityAgg
+    education_level_mod_entity_agg: educationLevelModEntityAgg,
+    age_range_entity: ageRangeEntity,
+    post_graduation_entity: postGraduationEntity
 };
 
 function transform(removeId=false) {
@@ -370,5 +374,7 @@ module.exports = {
     specialEducationDoc,
     educationLevelModDoc,
     educationLevelModEntitySeg,
-    educationLevelModEntityAgg
+    educationLevelModEntityAgg,
+    ageRangeEntity,
+    postGraduationEntity
 };
diff --git a/src/libs/routes_v1/federativeEntity.js b/src/libs/routes_v1/federativeEntity.js
index df39c381..9de0dfbf 100644
--- a/src/libs/routes_v1/federativeEntity.js
+++ b/src/libs/routes_v1/federativeEntity.js
@@ -233,56 +233,6 @@ rqf.addField({
     name: 'dims',
     field: true,
     where: false
-}).addValue({
-    name: 'adm_dependency',
-    table: 'escola',
-    tableField: 'dependencia_adm_id',
-    resultField: 'adm_dependency_id',
-    where: {
-        relation: '=',
-        type: 'integer',
-        field: 'dependencia_adm_id'
-    }
-}).addValue({
-    name: 'adm_dependency_detailed',
-    table: 'escola',
-    tableField: 'dependencia_adm_priv',
-    resultField: 'adm_dependency_detailed_id',
-    where: {
-        relation: '=',
-        type: 'integer',
-        field: 'dependencia_adm_priv'
-    }
-}).addValue({
-    name: 'education_level_mod',
-    table: 'escola',
-    tableField: 'etapas_mod_ensino_segmento_id',
-    resultField: 'education_level_mod_id',
-    where: {
-        relation: '=',
-        type: 'integer',
-        field: 'etapas_mod_ensino_segmento_id'
-    }
-}).addValue({
-    name:'integral_time',
-    table: 'escola',
-    tableField: 'tempo_integral',
-    resultField: 'integral_time_id',
-    where: {
-        relation: '=',
-        type: 'integer',
-        field: 'tempo_integral'
-    }
-  }).addValue({
-    name: 'education_level_short',
-    table: 'escola',
-    tableField: 'etapa_resumida',
-    resultField: 'education_level_short_id',
-    where: {
-        relation: '=',
-        type: 'integer',
-        field: 'etapa_resumida'
-    }
 }).addValue({
     name: 'region',
     table: 'regiao',
@@ -295,8 +245,8 @@ rqf.addField({
     },
     join: {
         primary: 'id',
-        foreign: 'regiao_id',
-        foreignTable: 'escola'
+        foreign: 'cod_reg',
+        foreignTable: 'docentes_sinopse'
     }
 }).addValue({
     name: 'mesoregion',
@@ -332,7 +282,7 @@ rqf.addField({
     }
 }).addValue({
     name: 'min_year',
-    table: 'escola',
+    table: 'docentes_sinopse',
     tableField: 'ano_censo',
     resultField: 'year',
     where: {
@@ -342,7 +292,7 @@ rqf.addField({
     },
 }).addValue({
     name: 'max_year',
-    table: 'escola',
+    table: 'docentes_sinopse',
     tableField: 'ano_censo',
     resultField: 'year',
     where: {
@@ -412,7 +362,7 @@ rqf.addField({
     }
 }, 'filter').addValueToField({
     name: 'school',
-    table: 'escola',
+    table: 'docentes_sinopse',
     tableField: ['nome_escola', 'id'],
     resultField: ['school_name', 'school_id'],
     where: {
@@ -427,7 +377,7 @@ rqf.addField({
     }
 }, 'dims').addValueToField({
     name: 'locale_id',
-    table: 'escola',
+    table: 'docentes_sinopse',
     tableField: 'localizacao_id',
     resultField: 'locale_id',
     where: {
@@ -437,7 +387,7 @@ rqf.addField({
     }
 }, 'dims').addValueToField({
     name: 'school_id',
-    table: 'escola',
+    table: 'docentes_sinopse',
     tableField: 'id',
     resultField: 'school_id',
     where: {
@@ -452,7 +402,7 @@ rqf.addField({
     }
 }, 'dims').addValueToField({
     name: 'school',
-    table: 'escola',
+    table: 'docentes_sinopse',
     tableField: 'nome_escola',
     resultField: 'school_name',
     where: {
@@ -467,7 +417,7 @@ rqf.addField({
     }
 }, 'filter').addValue({
     name: 'location',
-    table: 'escola',
+    table: 'docentes_sinopse',
     tableField: 'localizacao_id',
     resultField: 'location_id',
     where: {
@@ -475,16 +425,6 @@ rqf.addField({
         type: 'integer',
         field: 'localizacao_id'
     }
-}).addValue({
-    name: 'diff_location',
-    table: 'escola',
-    tableField: 'localizacao_diferenciada_par',
-    resultField: 'diff_location_id',
-    where: {
-        relation: '=',
-        type: 'integer',
-        field: 'localizacao_diferenciada_par'
-    }
 });
 
 federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
@@ -529,12 +469,103 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
         .order('docentes_sinopse.ano_censo')
         .where('docentes_sinopse.cod_reg = 0');
     }
+    else if (req.query.dims && req.query.dims.includes('special_education'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_ed_especial_classe_comum)', 'total_doc_ed_especial_classe_comum')
+        .field('SUM(docentes_sinopse.num_doc_ed_especial_classe_exclusiva)', 'total_doc_ed_especial_classe_exclusiva')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('adm_dependency_entity_agg'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_dependencia_adm_pub)', 'total_doc_dependencia_adm_pub')
+        .field('SUM(docentes_sinopse.num_doc_dependencia_adm_priv)', 'total_doc_dependencia_adm_priv')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('adm_dependency_entity'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_dependencia_adm_federal)', 'total_doc_dependencia_adm_federal')
+        .field('SUM(docentes_sinopse.num_doc_dependencia_adm_estadual)', 'total_doc_dependencia_adm_estadual')
+        .field('SUM(docentes_sinopse.num_doc_dependencia_adm_municipal)', 'total_doc_dependencia_adm_municipal')
+        .field('SUM(docentes_sinopse.num_doc_dependencia_adm_priv)', 'total_doc_dependencia_adm_priv')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('location_entity'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_loc_urbana_total)', 'total_doc_loc_urbana_total')
+        .field('SUM(docentes_sinopse.num_doc_loc_rural_total)', 'total_doc_loc_rural_total')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('gender_entity'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_masc_total)', 'total_doc_masc_total')
+        .field('SUM(docentes_sinopse.num_doc_fem_total)', 'total_doc_fem_total')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('age_range_entity'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_fem_24 + docentes_sinopse.num_doc_masc_24)', 'total_doc_24')
+        .field('SUM(docentes_sinopse.num_doc_fem_25_29 + docentes_sinopse.num_doc_masc_25_29)', 'total_doc_25_29')
+        .field('SUM(docentes_sinopse.num_doc_fem_30_39 + docentes_sinopse.num_doc_masc_30_39)', 'total_doc_30_39')
+        .field('SUM(docentes_sinopse.num_doc_fem_40_49 + docentes_sinopse.num_doc_masc_40_49)', 'total_doc_40_49')
+        .field('SUM(docentes_sinopse.num_doc_fem_50_54 + docentes_sinopse.num_doc_masc_50_54)', 'total_doc_50_54')
+        .field('SUM(docentes_sinopse.num_doc_fem_55_59 + docentes_sinopse.num_doc_masc_55_59)', 'total_doc_55_59')
+        .field('SUM(docentes_sinopse.num_doc_fem_60_mais + docentes_sinopse.num_doc_masc_60_mais)', 'total_doc_60_mais')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('post_graduation_entity'))
+    {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_esc_pos_grad_especializacao)', 'total_doc_esc_pos_grad_especializacao')
+        .field('SUM(docentes_sinopse.num_doc_esc_pos_grad_mestrado)', 'total_doc_esc_pos_grad_mestrado')
+        .field('SUM(docentes_sinopse.num_doc_esc_pos_grad_doutorado)', 'total_doc_esc_pos_grad_doutorado')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('contract_type_entity'))
+    {
+            req.sql.from('docentes_sinopse')
+            .field('SUM(docentes_sinopse.num_doc_vinc_concursado_efetivo_estavel_total)', 'total_doc_vinc_concursado_efetivo_estavel_total')
+            .field('SUM(docentes_sinopse.num_doc_vinc_contrato_temp_total)', 'total_doc_vinc_contrato_temp_total')
+            .field('SUM(docentes_sinopse.num_doc_vinc_contrato_terceirizado_total)', 'total_doc_vinc_contrato_terceirizado_total')
+            .field('SUM(docentes_sinopse.num_doc_vinc_contrato_clt_total)', 'total_doc_vinc_contrato_clt_total')
+            .field('docentes_sinopse.ano_censo', 'year')
+            .group('docentes_sinopse.ano_censo')
+            .order('docentes_sinopse.ano_censo')
+            .where('docentes_sinopse.cod_reg = 0');
+    }
     else {
         req.sql.from('docentes_sinopse')
-        .field('SUM(docentes_sinopse.qt_mat_bas)', 'total')
+        .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
         .field('docentes_sinopse.ano_censo', 'year')
         .group('docentes_sinopse.ano_censo')
-        .order('docentes_sinopse.ano_censo');
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_uf = 0');
     }
     next();
 }, query, aggregateData, id2str.transform(false), response('federative_entity'));
-- 
GitLab


From 5f8ac5715ea9e1e99c322153e2967c9863e96609 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Wed, 4 Sep 2024 19:08:44 -0300
Subject: [PATCH 3/5] Bug fix region for federative entity

---
 src/libs/routes_v1/federativeEntity.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/libs/routes_v1/federativeEntity.js b/src/libs/routes_v1/federativeEntity.js
index 9de0dfbf..fb200e65 100644
--- a/src/libs/routes_v1/federativeEntity.js
+++ b/src/libs/routes_v1/federativeEntity.js
@@ -312,8 +312,8 @@ rqf.addField({
     },
     join: {
         primary: 'id',
-        foreign: 'estado_id',
-        foreignTable: 'escola'
+        foreign: 'cod_uf',
+        foreignTable: 'docentes_sinopse'
     }
 }, 'dims').addValueToField({
     name: 'state',
@@ -327,8 +327,8 @@ rqf.addField({
     },
     join: {
         primary: 'id',
-        foreign: 'estado_id',
-        foreignTable: 'escola'
+        foreign: 'cod_uf',
+        foreignTable: 'docentes_sinopse'
     }
 }, 'filter').addValueToField({
     name: 'city',
@@ -559,7 +559,15 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
             .order('docentes_sinopse.ano_censo')
             .where('docentes_sinopse.cod_reg = 0');
     }
-    else {
+    else if (req.query.dims && req.query.dims.includes('state')) {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_mun = 0');
+    }
+    else if (req.query.dims && req.query.dims.includes('region')) {
         req.sql.from('docentes_sinopse')
         .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
         .field('docentes_sinopse.ano_censo', 'year')
@@ -567,6 +575,14 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
         .order('docentes_sinopse.ano_censo')
         .where('docentes_sinopse.cod_uf = 0');
     }
+    else {
+        req.sql.from('docentes_sinopse')
+        .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
+        .field('docentes_sinopse.ano_censo', 'year')
+        .group('docentes_sinopse.ano_censo')
+        .order('docentes_sinopse.ano_censo')
+        .where('docentes_sinopse.cod_reg = 0');
+    }
     next();
 }, query, aggregateData, id2str.transform(false), response('federative_entity'));
 
-- 
GitLab


From 12651034de00229f458766fe98b0589c64a5ea75 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Thu, 5 Sep 2024 16:02:43 -0300
Subject: [PATCH 4/5] Refactor federativeEntity route to include state and
 region filters

---
 src/libs/routes_v1/federativeEntity.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libs/routes_v1/federativeEntity.js b/src/libs/routes_v1/federativeEntity.js
index fb200e65..4a356247 100644
--- a/src/libs/routes_v1/federativeEntity.js
+++ b/src/libs/routes_v1/federativeEntity.js
@@ -429,8 +429,6 @@ rqf.addField({
 
 federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
 
-    console.log(req.query);
-
     if (req.query.dims && req.query.dims.includes('education_level_mod_entity_seg'))
     {
         req.sql.from('docentes_sinopse')
@@ -559,7 +557,7 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
             .order('docentes_sinopse.ano_censo')
             .where('docentes_sinopse.cod_reg = 0');
     }
-    else if (req.query.dims && req.query.dims.includes('state')) {
+    else if ((req.query.dims && req.query.dims.includes('state')) || (req.query.filter && req.query.filter.includes('state'))) {
         req.sql.from('docentes_sinopse')
         .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
         .field('docentes_sinopse.ano_censo', 'year')
@@ -567,7 +565,7 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
         .order('docentes_sinopse.ano_censo')
         .where('docentes_sinopse.cod_mun = 0');
     }
-    else if (req.query.dims && req.query.dims.includes('region')) {
+    else if ((req.query.dims && req.query.dims.includes('region')) || (req.query.filter && req.query.filter.includes('region'))) {
         req.sql.from('docentes_sinopse')
         .field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
         .field('docentes_sinopse.ano_censo', 'year')
-- 
GitLab


From 9aab5ca064a399efe313336136cd89a9aafb9b49 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Thu, 5 Sep 2024 19:25:46 -0300
Subject: [PATCH 5/5] Bug fix enrollmentAggregate and federativeEntity

---
 src/libs/convert/diffLocation.js           |  2 ++
 src/libs/convert/specialEducationEntity.js | 31 ++++++++++++++++++++++
 src/libs/middlewares/aggregateData.js      |  2 ++
 src/libs/middlewares/id2str.js             |  7 +++--
 src/libs/routes_v1/enrollmentAggregate.js  |  4 +--
 src/libs/routes_v1/federativeEntity.js     |  8 +++---
 6 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 src/libs/convert/specialEducationEntity.js

diff --git a/src/libs/convert/diffLocation.js b/src/libs/convert/diffLocation.js
index 16441ca7..aadc9cf6 100644
--- a/src/libs/convert/diffLocation.js
+++ b/src/libs/convert/diffLocation.js
@@ -30,5 +30,7 @@ module.exports = function location(id) {
             return 'Área remanescente de quilombos';
 		case 8:
 			return 'Área onde se localizam povos e comunidades tradicionais';
+        default:
+            return 'Não definido';
     }
 };
diff --git a/src/libs/convert/specialEducationEntity.js b/src/libs/convert/specialEducationEntity.js
new file mode 100644
index 00000000..b358c4ed
--- /dev/null
+++ b/src/libs/convert/specialEducationEntity.js
@@ -0,0 +1,31 @@
+/*
+Copyright (C) 2022 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 specialEducation(id) {
+    switch (id) {
+        case 1:
+        return 'Classe Comum';
+        case 2:
+        return 'Classe Exclusiva';
+        default:
+        return 'Não definido';
+    }
+};
+  
diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js
index 3dadee22..aaa1ede4 100644
--- a/src/libs/middlewares/aggregateData.js
+++ b/src/libs/middlewares/aggregateData.js
@@ -22,6 +22,7 @@ const convert = {
     modality_integral_time: 'educationLevelBasic',
     special_education: 'specialEducation',
     special_education_doc: 'specialEducationDoc',
+    special_education_entity: 'specialEducationEntity',
     education_level_mod_doc: 'educationLevelModDoc',
     education_level_mod_entity_seg: 'educationLevelModEntitySeg',
     education_level_mod_entity_agg: 'educationLevelModEntityAgg',
@@ -48,6 +49,7 @@ function aggregateData(req, res, next) {
             'modality_integral_time', 
             'special_education',
             'special_education_doc',
+            'special_education_entity',
             'education_level_mod_entity_seg',
             'education_level_mod_entity_agg',
             'adm_dependency_entity_agg',
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index 08a1ebed..078df393 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -118,6 +118,7 @@ const incomeRange = require(`${libs}/convert/incomeRange`);
 const ageRangeAggregate = require(`${libs}/convert/ageRangeAggregate`);
 const specialEducation = require(`${libs}/convert/specialEducation`);
 const specialEducationDoc = require(`${libs}/convert/specialEducationDoc`);
+const specialEducationEntity = require(`${libs}/convert/specialEducationEntity`);
 const educationLevelModDoc = require(`${libs}/convert/educationLevelModDoc`);
 const educationLevelModEntitySeg = require(`${libs}/convert/educationLevelModEntitySeg`);
 const educationLevelModEntityAgg = require(`${libs}/convert/educationLevelModEntityAgg`);
@@ -238,7 +239,8 @@ const ids = {
     education_level_mod_entity_seg: educationLevelModEntitySeg,
     education_level_mod_entity_agg: educationLevelModEntityAgg,
     age_range_entity: ageRangeEntity,
-    post_graduation_entity: postGraduationEntity
+    post_graduation_entity: postGraduationEntity,
+    special_education_entity: specialEducationEntity
 };
 
 function transform(removeId=false) {
@@ -376,5 +378,6 @@ module.exports = {
     educationLevelModEntitySeg,
     educationLevelModEntityAgg,
     ageRangeEntity,
-    postGraduationEntity
+    postGraduationEntity,
+    specialEducationEntity
 };
diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js
index d266d240..08d55ddb 100644
--- a/src/libs/routes_v1/enrollmentAggregate.js
+++ b/src/libs/routes_v1/enrollmentAggregate.js
@@ -114,7 +114,7 @@ enrollmentAggregateApp.get('/location', (req, res, next) => {
 enrollmentAggregateApp.get('/diff_location', (req, res, next) => {
     req.result = []
 
-    for (let i = 0; i <= 4; i++) {
+    for (let i = 0; i < 4; i++) {
         req.result.push({
             id: i, name: id2str.diffLocation(i)
         });
@@ -587,7 +587,7 @@ enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
         .field('SUM(escola.qt_mat_bas)', 'total')
         .field('escola.ano_censo', 'year')
         .group('escola.ano_censo')
-        .order('escola.ano_censo');
+        .order('escola.ano_censo')
     }
     next();
 }, query, aggregateData, id2str.transform(false), response('enrollment_aggregate'));
diff --git a/src/libs/routes_v1/federativeEntity.js b/src/libs/routes_v1/federativeEntity.js
index 4a356247..0b0c2b5c 100644
--- a/src/libs/routes_v1/federativeEntity.js
+++ b/src/libs/routes_v1/federativeEntity.js
@@ -212,17 +212,17 @@ federativeEntityApp.get('/state', (req, res, next) => {
     next();
 }, response('state'));
 
-federativeEntityApp.get('/special_education', (req, res, next) => {
+federativeEntityApp.get('/special_education_entity', (req, res, next) => {
     req.result = []
 
     for (let i = 1; i <= 2; i++) {
         req.result.push({
-            id: i, name: id2str.specialEducation(i)
+            id: i, name: id2str.specialEducationEntity(i)
         });
     }
 
     next();
-}, response('special_education'));
+}, response('special_education_entity'));
 
 
 rqf.addField({
@@ -467,7 +467,7 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
         .order('docentes_sinopse.ano_censo')
         .where('docentes_sinopse.cod_reg = 0');
     }
-    else if (req.query.dims && req.query.dims.includes('special_education'))
+    else if (req.query.dims && req.query.dims.includes('special_education_entity'))
     {
         req.sql.from('docentes_sinopse')
         .field('SUM(docentes_sinopse.num_doc_ed_especial_classe_comum)', 'total_doc_ed_especial_classe_comum')
-- 
GitLab