From 113dd143fcbf0e1648a5861284dde7d25dae90d6 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Wed, 14 Aug 2024 12:46:53 -0300
Subject: [PATCH] Working

---
 src/libs/routes_v1/employeesAggregate.js | 108 ++---------------------
 1 file changed, 5 insertions(+), 103 deletions(-)

diff --git a/src/libs/routes_v1/employeesAggregate.js b/src/libs/routes_v1/employeesAggregate.js
index 14654df9..ab5102ce 100644
--- a/src/libs/routes_v1/employeesAggregate.js
+++ b/src/libs/routes_v1/employeesAggregate.js
@@ -59,7 +59,7 @@ employeesAggregateApp.get('/years', (req, res, next) => {
 employeesAggregateApp.get('/education_level_mod_doc', (req, res, next) => {
     req.result = []
 
-    for (let i = 1; i <= 13; i++) {
+    for (let i = 1; i <= 8; i++) {
         req.result.push({
             id: i, name: id2str.educationLevelModDoc(i)
         });
@@ -67,31 +67,6 @@ employeesAggregateApp.get('/education_level_mod_doc', (req, res, next) => {
     next();
 }, response('education_level_mod_doc'));
 
-employeesAggregateApp.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'));
-
-employeesAggregateApp.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'));
-
 employeesAggregateApp.get('/special_education_doc', (req, res, next) => {
     req.result = []
 
@@ -113,56 +88,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',
@@ -345,36 +270,13 @@ rqf.addField({
         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'
-    }
-});
+}, 'filter');
 
 // Return all cities
 employeesAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
 
-    if (req.query.filter && !req.query.filter.includes('school'))
-        return;
-
-    if (req.query.filter == undefined)
-        return;
+    if ((req.query.filter && !req.query.filter.includes('school')) || req.query.filter == undefined)
+        throw 'Filtro escola deve ser selecionado.';
 
     if (req.query.dims && req.query.dims.includes('education_level_mod_doc')) {
         req.sql.from('escola')
@@ -409,6 +311,6 @@ employeesAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
         .where('escola.situacao_funcionamento_pareada = 1 and (escola.ensino_regular = 1 or escola.ensino_eja = 1 or escola.educacao_profissional = 1)');
     }
     next();
-}, query, aggregateData, id2str.transform(false), response('enrollment_aggregate'));
+}, query, aggregateData, id2str.transform(false), response('employees_aggregate'));
 
 module.exports = employeesAggregateApp;
-- 
GitLab