From 98e690250cc9adc867a550a62a1115d43593bd70 Mon Sep 17 00:00:00 2001
From: fgs21 <fgs21@inf.ufpr.br>
Date: Mon, 26 Feb 2024 11:07:16 -0300
Subject: [PATCH] [FIX] '/region' subroute duplicate removed
---
src/libs/middlewares/id2str.js | 2 +-
src/libs/routes_v1/newPnad.js | 29 ++++-------------------------
2 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index d15505d3..02273a8b 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -217,7 +217,7 @@ const ids = {
bolsa_familia_id: attendsSchool,
new_pnad_ethnic_group_id: ethnicGroupNewPnad,
cap_code_id: capitalCode,
- reg_code_id: regionCode,
+ region_id: regionCode,
metro_code_id: metroCode,
modality_shift_id: modalityShift,
income_range_id: incomeRange
diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js
index 09b292fc..d2ad0de7 100644
--- a/src/libs/routes_v1/newPnad.js
+++ b/src/libs/routes_v1/newPnad.js
@@ -97,7 +97,7 @@ PnadNovoApp.get('/new_pnad_adm_dependency', (req, res, next) => {
next();
}, response('new_pnad_adm_dependency'));
-PnadNovoApp.get('/reg_code', (req, res, next) => {
+PnadNovoApp.get('/region', (req, res, next) => {
req.result = []
for (let i = 1; i < 6; i++) {
req.result.push({
@@ -106,18 +106,7 @@ PnadNovoApp.get('/reg_code', (req, res, next) => {
}
next();
-}, response('reg_code'));
-
-PnadNovoApp.get('/reg_code', (req, res, next) => {
- req.result = []
- for (let i = 1; i < 6; i++) {
- req.result.push({
- id: i, name: id2str.regionCode(i)
- });
- }
-
- next();
-}, response('reg_code'));
+}, response('region'));
PnadNovoApp.get('/cap_code', (req, res, next) => {
req.result = []
@@ -444,10 +433,10 @@ rqf.addField({
field: 'cod_cap'
}
}).addValue({
- name: 'reg_code',
+ name: 'region',
table: 'pnad_novo',
tableField: 'cod_regiao',
- resultField: 'reg_code_id',
+ resultField: 'region_id',
where: {
relation: '=',
type: 'integer',
@@ -514,16 +503,6 @@ rqf.addField({
type: 'integer',
field: 'microrregiao_id'
}
-}).addValue({
- name: 'region',
- table: 'pnad_novo',
- tableField: 'cod_regiao',
- resultField: 'reg_code_id',
- where: {
- relation: '=',
- type: 'integer',
- field: 'cod_regiao',
- }
});
PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
--
GitLab