Merge branch 'development' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into development

src/libs/routes/api.js

@@ -102,7 +102,7 @@ api.use('/distribution_factor', distributionFactor);
 api.use('/siope', siope);
 api.use('/out_of_school', outOfSchool);
 api.use('/classroom_count', classroomCount);
-api.use('/dailyChargeAmount', dailyChargeAmount);
+api.use('/daily_charge_amount', dailyChargeAmount);
 api.use('/transport', transport);
 
 module.exports = api;

src/libs/routes/dailyChargeAmount.js

 const express = require('express');
 
-const dailyChargeAmount = express.Router();
+const dailyChargeAmountApp = express.Router();
 
 const libs = `${process.cwd()}/libs`;
 
@@ -31,27 +31,27 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i
 let rqf = new ReqQueryFields();
 let rqfCount = new ReqQueryFields();
 
-dailyChargeAmount.get('/year_range', (req, res, next) => {
+dailyChargeAmountApp.get('/year_range', (req, res, next) => {
     req.sql.from('turma')
     .field('MIN(turma.ano_censo)', 'start_year')
     .field('MAX(turma.ano_censo)', 'end_year');
     next();
 }, query, response('range'));
 
-dailyChargeAmount.get('/years', (req, res, next) => {
+dailyChargeAmountApp.get('/years', (req, res, next) => {
     req.sql.from('turma')
     .field('DISTINCT turma.ano_censo', 'year');
     next();
 }, query, response('years'));
 
-dailyChargeAmount.get('/source', (req, res, next) => {
+dailyChargeAmountApp.get('/source', (req, res, next) => {
     req.sql.from('fonte')
     .field('fonte', 'source')
     .where('tabela = \'turma\'');
     next();
 }, query, response('source'));
 
-dailyChargeAmount.get('/adm_dependency', (req, res, next) => {
+dailyChargeAmountApp.get('/adm_dependency', (req, res, next) => {
     req.result = [];
     for(let i = 1; i <= 4; ++i) {
         req.result.push({
@@ -62,7 +62,7 @@ dailyChargeAmount.get('/adm_dependency', (req, res, next) => {
     next();
 }, response('adm_dependency'));
 
-dailyChargeAmount.get('/adm_dependency_detailed', cache('15 day'), (req, res, next) => {
+dailyChargeAmountApp.get('/adm_dependency_detailed', cache('15 day'), (req, res, next) => {
     req.result = [];
     for(let i = 1; i <= 6; ++i) {
         req.result.push({
@@ -73,7 +73,7 @@ dailyChargeAmount.get('/adm_dependency_detailed', cache('15 day'), (req, res, ne
     next();
 }, response('adm_dependency_detailed'));
 
-dailyChargeAmount.get('/location', cache('15 day'), (req, res, next) => {
+dailyChargeAmountApp.get('/location', cache('15 day'), (req, res, next) => {
     req.result = [
         {id: 1, name: 'Urbana'},
         {id: 2, name: 'Rural'}
@@ -81,7 +81,7 @@ dailyChargeAmount.get('/location', cache('15 day'), (req, res, next) => {
     next();
 }, response('location'));
 
-dailyChargeAmount.get('/rural_location', (req, res, next) => {
+dailyChargeAmountApp.get('/rural_location', (req, res, next) => {
     req.result = [
         {id: 1, name: "Urbana"},
         {id: 2, name: "Rural"},
@@ -93,7 +93,7 @@ dailyChargeAmount.get('/rural_location', (req, res, next) => {
     next();
 }, response('rural_location'));
 
-dailyChargeAmount.get('/education_level_short', (req, res, next) => {
+dailyChargeAmountApp.get('/education_level_short', (req, res, next) => {
     req.result = [
         {id: null, name: 'Não classificada'},
         {id: 1, name: 'Creche'},
@@ -107,7 +107,7 @@ dailyChargeAmount.get('/education_level_short', (req, res, next) => {
     next();
 }, response('education_level_short'));
 
-dailyChargeAmount.get('/average/education_level_mod', (req, res, next) => {
+dailyChargeAmountApp.get('/average/education_level_mod', (req, res, next) => {
     req.result = [
         {id: null, name: 'Não classificada'},
         {id: 1, name: 'Creche'},
@@ -266,7 +266,7 @@ rqf.addField({
     }
 });
 
-dailyChargeAmount.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+dailyChargeAmountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     var status = 0;
     if ('integral_time' in req.filter) {
         if (req.filter['integral_time'] == '0'
@@ -325,7 +325,7 @@ dailyChargeAmount.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     next();
 }, id2str.transform(), response('turma'));
 
-dailyChargeAmount.get('/average', rqf.parse(), rqf.build(), (req, res, next) => {
+dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next) => {
     var status = 0;
     if (('education_level_mod' in req.filter || 'education_level_mod' in req.dims)
     && ('integral_time' in req.filter)) {
@@ -381,4 +381,4 @@ dailyChargeAmount.get('/average', rqf.parse(), rqf.build(), (req, res, next) =>
     next();
 }, id2str.transform(), response('turma'));
 
-module.exports = dailyChargeAmount;
+module.exports = dailyChargeAmountApp;

src/test/dailyChargeAmount.js

@@ -26,7 +26,7 @@ chai.use(chaiHttp);
 describe('request daily charge amount', () => {
     it('should list the year range', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount/year_range')
+            .get('/api/v1/daily_charge_amount/year_range')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -40,7 +40,7 @@ describe('request daily charge amount', () => {
 
     it('should list the year range', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount/years')
+            .get('/api/v1/daily_charge_amount/years')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -53,7 +53,7 @@ describe('request daily charge amount', () => {
 
     it('should list the locations', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount/location')
+            .get('/api/v1/daily_charge_amount/location')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -67,7 +67,7 @@ describe('request daily charge amount', () => {
 
     it('should list education level short', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount/education_level_short')
+            .get('/api/v1/daily_charge_amount/education_level_short')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -81,7 +81,7 @@ describe('request daily charge amount', () => {
 
     it('should list education level mod', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount/education_level_mod')
+            .get('/api/v1/daily_charge_amount/education_level_mod')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -95,7 +95,7 @@ describe('request daily charge amount', () => {
 
     it('should list the dimensions of education_level_short', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount?dims=education_level_short&filter=min_year:"2015",max_year:"2015",integral_time:"0",period:["3"]')
+            .get('/api/v1/daily_charge_amount?dims=education_level_short&filter=min_year:"2015",max_year:"2015",integral_time:"0",period:["3"]')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -115,7 +115,7 @@ describe('request daily charge amount', () => {
 
     it('should list the filter of education level mod', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount/average?filter=education_level_mod:["3","4","5","6"],integral_time:"0",period:["3"]')
+            .get('/api/v1/daily_charge_amount/average?filter=education_level_mod:["3","4","5","6"],integral_time:"0",period:["3"]')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -131,7 +131,7 @@ describe('request daily charge amount', () => {
 
     it('should return 400 with no filters', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount')
+            .get('/api/v1/daily_charge_amount')
             .end((err, res) => {
                 res.should.have.status(400);
                 res.should.be.json;
@@ -143,7 +143,7 @@ describe('request daily charge amount', () => {
 
     it('should return 400 with no filters', (done) => {
         chai.request(server)
-            .get('/api/v1/dailyChargeAmount/average?filter=education_level_mod:["3","4","5","6"]')
+            .get('/api/v1/daily_charge_amount/average?filter=education_level_mod:["3","4","5","6"]')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;