Merge branch development into homologa

Add functional version of middleware, add flag to check whether it runs default query or modified query

src/libs/routes_v2/school.js

@@ -16,6 +16,8 @@ const id2str = require(`${libs}/middlewares/id2str`);
 
 const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
 
+const ReqBody = require(`${libs}/middlewares/reqBody`);
+
 const request = require(`request`);
 
 const config = require(`${libs}/config`);
@@ -28,6 +30,7 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i
 
 let rqf = new ReqQueryFields();
 let rqfCount = new ReqQueryFields();
+let reqBody = new ReqBody();
 
 // Return location
 schoolApp.get('/year_range', cache('15 day'), (req, res, next) => {
@@ -635,11 +638,14 @@ schoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     next();
 }, query, response('school'));
 
-schoolApp.get('/count', cache('15 day'), rqfCount.parse(), (req, res, next) => {
+schoolApp.get('/count', cache('15 day'), rqfCount.parse(), reqBody.parse(), (req, res, next) => {
 	let arrang = ["arranjo_creche", "arranjo_pre", "arranjo_fundamental_ai", "arranjo_fundamental_af", "arranjo_multietapa", "arranjo_ensino_medio", "ensino_eja", "educacao_profissional", "ensino_especial"];
 
+    if (!req.hasMetrics) {
+        req.sql.field('COUNT(escola.id)', 'total');
+    }
+
     req.sql.from('escola')
-        .field('COUNT(escola.id)', 'total')
         .field("'Brasil'", 'name')
         .field('escola.ano_censo', 'year')
         .group('escola.ano_censo')