Merge branch 'idh_r' into 'development'

Fix error where city in filter

See merge request !64

src/libs/routes/idhm.js

@@ -138,8 +138,7 @@ idhmApp.get('/', rqf.parse(), (req, res, next) => {
           message: 'Wrong/No filter specified'
       });
   }
-  if ("state" in req.filter) {
-      console.log("BBBBB");
+  if ("state" in req.filter && !("city" in req.filter)) {
       req.sql.from('adh_idh_uf')
       .field('adh_idh_uf.idhm', 'total')
       .field('adh_idh_uf.ano_censo', 'year')
@@ -147,34 +146,16 @@ idhmApp.get('/', rqf.parse(), (req, res, next) => {
       .group('adh_idh_uf.idhm')
       .group('adh_idh_uf.ano_censo')
       .group('adh_idh_uf.estado_id')
-  } else if ("state" in req.dims) {
-      console.log("AAAAAAAAA");
+   } else if ("city" in req.filter) {
       req.sql.from('adh_idh')
       .field('adh_idh.idhm', 'total')
       .field('adh_idh.ano_censo', 'year')
       .field('adh_idh.municipio_id', 'city_id')
-      .field('adh_idh.estado_id', 'state_id')
+      .field('adh_idh.estado_id', 'city_id')
       .group('adh_idh.idhm')
       .group('adh_idh.ano_censo')
       .group('adh_idh.municipio_id')
       .group('adh_idh.estado_id')
-   } else if ("city" in req.filter) {
-       req.sql.from('adh_idh')
-       .field('adh_idh.idhm', 'total')
-       .field('adh_idh.ano_censo', 'year')
-       .field('adh_idh.municipio_id', 'city_id')
-       .group('adh_idh.idhm')
-       .group('adh_idh.ano_censo')
-       .group('adh_idh.municipio_id')
-   } else if ("city" in req.dims) {
-          req.sql.from('adh_idh')
-          .field('adh_idh.idhm', 'total')
-          .field('adh_idh.ano_censo', 'year')
-          .field('adh_idh.municipio_id', 'city_id')
-          .group('adh_idh.idhm')
-          .group('adh_idh.ano_censo')
-          .group('adh_idh.municipio_id')
-          .group('adh_idh.estado_id')
     } else {
         next({
             status: 400,

src/libs/routes/idhmr.js

@@ -74,12 +74,12 @@ rqf.addField({
         relation: '=',
         type: 'integer',
         field: 'estado_id',
-        table: 'adh_idh_uf'
+        table: '@'
     },
     join: {
         primary: 'id',
         foreign: 'estado_id',
-        foreignTable: 'adh_idh_uf'
+        foreignTable: '@'
     }
 }).addValue({
     name: 'min_year',
@@ -114,7 +114,7 @@ idhmrApp.get('/', rqf.parse(), (req, res, next) => {
           message: 'Wrong/No filter specified'
       });
   }
-  if ("state" in req.filter) {
+  if ("state" in req.filter && !("city" in req.filter)) {
       req.sql.from('adh_idh_uf')
       .field('adh_idh_uf.idhm_r', 'total')
       .field('adh_idh_uf.ano_censo', 'year')
@@ -123,7 +123,8 @@ idhmrApp.get('/', rqf.parse(), (req, res, next) => {
       req.sql.from('adh_idh')
       .field('adh_idh.idhm_r', 'total')
       .field('adh_idh.ano_censo', 'year')
-      .field('adh_idh.municipio_id', 'city_id');
+      .field('adh_idh.municipio_id', 'city_id')
+      .field('adh_idh.estado_id', 'estado_id');
   } else {
         next({
             status: 400,