Merge branch 'fix_idhm' into development

src/libs/models/user.js

@@ -39,6 +39,15 @@ var UserSchema = new Schema({
     course: {
         type: String,
     },
+    complement: {
+        type: String,
+    },
+    address: {
+        type: String,
+    },
+    phone: {
+        type: String,
+    },
     segment: {
         type: String,
         required: [true, 'O campo Segmento é obrigatório.']

src/libs/routes/idhm.js

@@ -16,7 +16,7 @@ const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
 
 const id2str = require(`${libs}/middlewares/id2str`);
 
-const config = require(`${libs}/config`); 
+const config = require(`${libs}/config`);
 
 const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
 
@@ -164,42 +164,32 @@ rqf.addField({
 
 idhmApp.get('/', rqf.parse(), (req, res, next) => {
   log.debug(req.sql.toParam());
-  if((Object.keys(req.filter).length === 0) && (Object.keys(req.dims).length === 0)) {
-      req.sql.from('adh_idh_uf')
-      .field('adh_idh_uf.idhm', 'total')
-      .field('adh_idh_uf.ano_censo', 'year')
-      .field('adh_idh_uf.estado_id', 'state_id')
-      .group('adh_idh_uf.idhm')
-      .group('adh_idh_uf.ano_censo')
-      .group('adh_idh_uf.estado_id')
-  } else if ("state" in req.filter && !("city" in req.filter) && !("city" in req.dims)) {
-      req.sql.from('adh_idh_uf')
-      .field('adh_idh_uf.idhm', 'total')
-      .field('adh_idh_uf.ano_censo', 'year')
-      .field('adh_idh_uf.estado_id', 'state_id')
-      .group('adh_idh_uf.idhm')
-      .group('adh_idh_uf.ano_censo')
-      .group('adh_idh_uf.estado_id')
-   } else if ("city" in req.filter || "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')
-      .field('adh_idh.estado_id', 'state_id')
-      .group('adh_idh.idhm')
-      .group('adh_idh.ano_censo')
-      .group('adh_idh.municipio_id')
-      .group('adh_idh.estado_id')
-    } else {
-      req.sql.from('adh_idh_uf')
-      .field('adh_idh_uf.idhm', 'total')
-      .field('adh_idh_uf.ano_censo', 'year')
-      .field('adh_idh_uf.estado_id', 'state_id')
-      .group('adh_idh_uf.idhm')
-      .group('adh_idh_uf.ano_censo')
-      .group('adh_idh_uf.estado_id')
-    }
-   next();
+      if (("city" in req.dims) || ("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')
+          .group('adh_idh.idhm')
+          .group('adh_idh.ano_censo')
+          .group('adh_idh.municipio_id')
+          .group('adh_idh.estado_id')
+      } else if (("state" in req.filter) || ("state" in req.dims)) {
+          req.sql.from('adh_idh_uf')
+          .field('adh_idh_uf.idhm', 'total')
+          .field('adh_idh_uf.ano_censo', 'year')
+          .field('adh_idh_uf.estado_id', 'state_id')
+          .group('adh_idh_uf.idhm')
+          .group('adh_idh_uf.ano_censo')
+          .group('adh_idh_uf.estado_id')
+        } else {
+            res.status(400);
+            next({
+                status: 400,
+                message: 'Wrong/No filter specified'
+            });
+        }
+        next();
 }, rqf.build(), query, id2str.transform(), response('idhm'));
 
 module.exports = idhmApp;

src/libs/routes/idhmr.js

@@ -16,7 +16,7 @@ const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
 
 const id2str = require(`${libs}/middlewares/id2str`);
 
-const config = require(`${libs}/config`); 
+const config = require(`${libs}/config`);
 
 const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
 
@@ -140,43 +140,32 @@ rqf.addField({
 
 idhmrApp.get('/', rqf.parse(), (req, res, next) => {
   log.debug(req.sql.toParam());
-  if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0 ) {
-      req.sql.from('adh_idh_uf')
-      .field('adh_idh_uf.idhm_r', 'total')
-      .field('adh_idh_uf.ano_censo', 'year')
-      .field('adh_idh_uf.estado_id', 'state_id')
-      .group('adh_idh_uf.idhm_r')
-      .group('adh_idh_uf.ano_censo')
-      .group('adh_idh_uf.estado_id')
-  } else if ("state" in req.filter && !("city" in req.filter) && !("city" in req.dims)) {
-      req.sql.from('adh_idh_uf')
-      .field('adh_idh_uf.idhm_r', 'total')
-      .field('adh_idh_uf.ano_censo', 'year')
-      .field('adh_idh_uf.estado_id', 'state_id')
-      .group('adh_idh_uf.idhm_r')
-      .group('adh_idh_uf.ano_censo')
-      .group('adh_idh_uf.estado_id')
-  } else if ("city" in req.filter || "city" in req.dims) {
-      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.estado_id', 'state_id')
-      .group('adh_idh.idhm_r')
-      .group('adh_idh.ano_censo')
-      .group('adh_idh.municipio_id')
-      .group('adh_idh.estado_id')
-  } else {
-      req.sql.from('adh_idh_uf')
-      .field('adh_idh_uf.idhm_r', 'total')
-      .field('adh_idh_uf.ano_censo', 'year')
-      .field('adh_idh_uf.estado_id', 'state_id')
-      .group('adh_idh_uf.idhm_r')
-      .group('adh_idh_uf.ano_censo')
-      .group('adh_idh_uf.estado_id')
-    }
-
-  next();
+    if (("city" in req.dims) || ("city" in req.filter)) {
+        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.estado_id', 'state_id')
+        .group('adh_idh.idhm_r')
+        .group('adh_idh.ano_censo')
+        .group('adh_idh.municipio_id')
+        .group('adh_idh.estado_id')
+    } else if (("state" in req.filter) || ("state" in req.dims)) {
+        req.sql.from('adh_idh_uf')
+        .field('adh_idh_uf.idhm_r', 'total')
+        .field('adh_idh_uf.ano_censo', 'year')
+        .field('adh_idh_uf.estado_id', 'state_id')
+        .group('adh_idh_uf.idhm_r')
+        .group('adh_idh_uf.ano_censo')
+        .group('adh_idh_uf.estado_id')
+      } else {
+          res.status(400);
+          next({
+              status: 400,
+              message: 'Wrong/No filter specified'
+          });
+      }
+      next();
 }, rqf.build(),query, id2str.transform(), response('idhmr'));
 
 module.exports = idhmrApp;