From eeaa1ceddfb069d58e010733ce7a4df119876f61 Mon Sep 17 00:00:00 2001
From: Fernando Erd <fce15@inf.ufpr.br>
Date: Fri, 7 Jul 2017 10:57:41 -0300
Subject: [PATCH] Fix - Pattern route
---
src/libs/routes/idhmr.js | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/libs/routes/idhmr.js b/src/libs/routes/idhmr.js
index 64c805ce..1c1b8f0f 100644
--- a/src/libs/routes/idhmr.js
+++ b/src/libs/routes/idhmr.js
@@ -105,7 +105,7 @@ rqf.addField({
}
});
-idhmrApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+idhmrApp.get('/', rqf.parse(), (req, res, next) => {
log.debug(req.sql.toParam());
if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0 ) {
res.status(400);
@@ -115,20 +115,18 @@ idhmrApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
});
}
if ("state" in req.filter) {
- req.sql.field('(adh_idh_uf.idhm_r)', 'IDHM')
- .field("'Brasil'", 'name')
- .field('adh_idh_uf.estado_id', 'estado_id')
- .field('adh_idh_uf.ano_censo', 'year')
- .from('adh_idh_uf')
+ req.sql.from('adh_idh_uf')
+ .field('adh_idh_uf.idhm_r', 'IDHME')
+ .field('adh_idh_uf.ano_censo', 'year')
+ .field('adh_idh_uf.municipio_id', 'city_id');
} else if ("city" in req.filter) {
- req.sql.field('(adh_idh.idhm_r)', 'IDHM')
- .field("'Brasil'", 'name')
- .field('adh_idh.municipio_id', 'municipio_id')
- .field('adh_idh.estado_id', 'estado_id')
- .field('adh_idh.ano_censo', 'year')
- .from('adh_idh')
+ req.sql.from('adh_idh')
+ .field('adh_idh.idhm_r', 'IDHME')
+ .field('adh_idh.ano_censo', 'year')
+ .field('adh_idh.municipio_id', 'city_id');
+
}
next();
-}, query, id2str.transform(true), response('idhmr'));
+}, rqf.build(),query, response('idhmr'));
module.exports = idhmrApp;
--
GitLab