From c2ccc44ad0b91ae222a299f2ad095cf3a4f021a8 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Fri, 2 Aug 2024 13:49:02 -0300
Subject: [PATCH] Fix filters and names
---
...{especialEducation.js => specialEducation.js} | 2 +-
src/libs/middlewares/aggregateData.js | 4 ++--
src/libs/middlewares/id2str.js | 6 +++---
src/libs/routes_v1/enrollmentAggregate.js | 16 ++++++++--------
4 files changed, 14 insertions(+), 14 deletions(-)
rename src/libs/convert/{especialEducation.js => specialEducation.js} (95%)
diff --git a/src/libs/convert/especialEducation.js b/src/libs/convert/specialEducation.js
similarity index 95%
rename from src/libs/convert/especialEducation.js
rename to src/libs/convert/specialEducation.js
index 46349784..aac420d2 100644
--- a/src/libs/convert/especialEducation.js
+++ b/src/libs/convert/specialEducation.js
@@ -18,7 +18,7 @@ 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 especialEducation(id) {
+module.exports = function specialEducation(id) {
switch (id) {
case 1:
return 'Inclusiva';
diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js
index c20f3d55..714830df 100644
--- a/src/libs/middlewares/aggregateData.js
+++ b/src/libs/middlewares/aggregateData.js
@@ -20,13 +20,13 @@ const convert = {
integral_time_agg: 'integralTime',
period_agg: 'period',
modality_integral_time: 'educationLevelBasic',
- especial_education: 'especialEducation'
+ special_education: 'specialEducation'
}
function aggregateData(req, res, next) {
if (req.query.dims) {
const newResult = []
- const aggregateFields = ['gender', 'age_range', 'ethnic_group', 'education_level_mod_agg', 'integral_time_agg', 'period_agg', 'modality_integral_time', 'especial_education']
+ const aggregateFields = ['gender', 'age_range', 'ethnic_group', 'education_level_mod_agg', 'integral_time_agg', 'period_agg', 'modality_integral_time', 'special_education']
let id;
const fields = req.query.dims.split(',');
let currentAggregateField;
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index 06f24488..1d7b3de4 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -116,7 +116,7 @@ const metroCode = require(`${libs}/convert/metroCode`);
const modalityShift = require(`${libs}/convert/modalityShift`);
const incomeRange = require(`${libs}/convert/incomeRange`);
const ageRangeAggregate = require(`${libs}/convert/ageRangeAggregate`);
-const especialEducation = require(`${libs}/convert/especialEducation`);
+const specialEducation = require(`${libs}/convert/specialEducation`);
const ids = {
gender_id: gender,
@@ -226,7 +226,7 @@ const ids = {
metro_code_id: metroCode,
modality_shift_id: modalityShift,
income_range_id: incomeRange,
- especial_education: especialEducation
+ special_education: specialEducation
};
function transform(removeId=false) {
@@ -358,5 +358,5 @@ module.exports = {
metroCode,
modalityShift,
incomeRange,
- especialEducation
+ specialEducation
};
diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js
index e7de586c..d266d240 100644
--- a/src/libs/routes_v1/enrollmentAggregate.js
+++ b/src/libs/routes_v1/enrollmentAggregate.js
@@ -78,7 +78,7 @@ enrollmentAggregateApp.get('/adm_dependency_detailed', (req, res, next) => {
next();
}, response('adm_dependency_detailed'));
-enrollmentAggregateApp.get('/education_level_mod', (req, res, next) => {
+enrollmentAggregateApp.get('/education_level_mod_agg', (req, res, next) => {
req.result = []
for (let i = 1; i <= 13; i++) {
@@ -87,9 +87,9 @@ enrollmentAggregateApp.get('/education_level_mod', (req, res, next) => {
});
}
next();
-}, response('education_level_mod'));
+}, response('education_level_mod_agg'));
-enrollmentAggregateApp.get('/integral_time', (req, res, next) => {
+enrollmentAggregateApp.get('/integral_time_agg', (req, res, next) => {
req.result = []
for (let i = 0; i <= 3; i++) {
@@ -98,7 +98,7 @@ enrollmentAggregateApp.get('/integral_time', (req, res, next) => {
});
}
next();
-}, response('education_level_mod'));
+}, response('integral_time_agg'));
enrollmentAggregateApp.get('/location', (req, res, next) => {
req.result = []
@@ -212,17 +212,17 @@ enrollmentAggregateApp.get('/state', (req, res, next) => {
next();
}, response('state'));
-enrollmentAggregateApp.get('/especial_education', (req, res, next) => {
+enrollmentAggregateApp.get('/special_education', (req, res, next) => {
req.result = []
for (let i = 1; i <= 2; i++) {
req.result.push({
- id: i, name: id2str.especialEducation(i)
+ id: i, name: id2str.specialEducation(i)
});
}
next();
-}, response('especial_education'));
+}, response('special_education'));
rqf.addField({
@@ -574,7 +574,7 @@ enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.group('escola.ano_censo')
.order('escola.ano_censo')
}
- else if (req.query.dims && req.query.dims.includes('especial_education')) {
+ else if (req.query.dims && req.query.dims.includes('special_education')) {
req.sql.from('escola')
.field('SUM(escola.qt_mat_esp_cc)', 'total_qt_mat_esp_cc')
.field('SUM(escola.qt_mat_esp_ce)', 'total_qt_mat_esp_ce')
--
GitLab