diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc8c4b6d8bd52a50299f89730400bdda9ba54e58..f30e795881167ccf8926007b3c2e3a1059fe5c52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,3 @@ run_tests:
- gulp test
tags:
- node
- cache:
- paths:
- - node_modules/
diff --git a/src/libs/convert/citySize.js b/src/libs/convert/citySize.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f1c0ebdefb3499c3f6642287b7d4b6590de332a
--- /dev/null
+++ b/src/libs/convert/citySize.js
@@ -0,0 +1,20 @@
+module.exports = function citySize(id) {
+ switch (id) {
+ case 1:
+ return 'até 5000';
+ case 2:
+ return '5001 - 10000';
+ case 3:
+ return '10001 - 20000';
+ case 4:
+ return '20001 - 50000';
+ case 5:
+ return '50001 - 100000';
+ case 6:
+ return '100001 - 500000';
+ case 7:
+ return 'mais que 500000';
+ default:
+ return 'Não classificado';
+ }
+};
diff --git a/src/libs/convert/incomeLevel.js b/src/libs/convert/incomeLevel.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d3677ef757a7827de0cf76a0a884e1128f2de49
--- /dev/null
+++ b/src/libs/convert/incomeLevel.js
@@ -0,0 +1,16 @@
+module.exports = function citySize(id) {
+ switch (id) {
+ case 1:
+ return '1º quintil – 20% menores';
+ case 2:
+ return '2º quintil';
+ case 3:
+ return '3º quintil';
+ case 4:
+ return '4º quintil';
+ case 5:
+ return '5º quintil – 20% maiores';
+ default:
+ return 'Não classificado';
+ }
+};
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index 9304758c47e84a553e37f6c0f9d644addb785208..4e77b892ce85273f33253d5ef13387996fa5766e 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -12,6 +12,8 @@ const educationLevel = require(`${libs}/convert/educationLevel`);
const educationLevelMod = require(`${libs}/convert/educationLevelMod`);
const educationLevelShort = require(`${libs}/convert/educationLevelShort`);
const educationType = require(`${libs}/convert/educationType`);
+const citySize = require(`${libs}/convert/citySize`);
+const incomeLevel = require(`${libs}/convert/incomeLevel`);
const ids = {
gender_id: gender,
@@ -56,7 +58,9 @@ const ids = {
library_id: booleanVariable,
reading_room_id: booleanVariable,
water_id: booleanVariable,
- education_type_id: educationType
+ education_type_id: educationType,
+ income_level_id: incomeLevel,
+ city_size_id: citySize
};
function transform(removeId=false) {
diff --git a/src/libs/routes/api.js b/src/libs/routes/api.js
index b4648cc44b8f43a3b0254b518f6e092335303171..7353dfd144c09add582aab1262ee8e29248c39a2 100644
--- a/src/libs/routes/api.js
+++ b/src/libs/routes/api.js
@@ -40,6 +40,8 @@ const idhm = require('./idhm');
const idhmr = require('./idhmr');
+const idhml = require('./idhml');
+
api.get('/', (req, res) => {
res.json({ msg: 'SimCAQ API is running' });
});
@@ -61,5 +63,6 @@ api.use('/idhm', cache('1 day'), idhm);
api.use('/idhme', cache('15 day'), idhme);
api.use('/pibpercapita', cache('1 day'), pibpercapita);
api.use('/population', cache('1 day'), population);
+api.use('/idhml', cache('1 day'), idhml);
module.exports = api;
diff --git a/src/libs/routes/classroom.js b/src/libs/routes/classroom.js
index 58599f19a8e94761d76a2de3e1f21d56456a17de..7a4f3ce278d1136a47dc08d642a47f56ba399880 100644
--- a/src/libs/routes/classroom.js
+++ b/src/libs/routes/classroom.js
@@ -183,7 +183,6 @@ rqf.addField({
});
classroomApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
- console.log(req.filter);
req.sql.from('escola')
.field('SUM(escola.num_salas)', 'total')
.field("'Brasil'", 'name')
diff --git a/src/libs/routes/idhme.js b/src/libs/routes/idhme.js
index 1a3c581ca4de0dc2a202ec44953549e391a6fb73..d762c95d7b2c6eb59478b2c49af54d4b712957c0 100644
--- a/src/libs/routes/idhme.js
+++ b/src/libs/routes/idhme.js
@@ -90,12 +90,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: '@'
}
});
@@ -107,22 +107,24 @@ idhmeApp.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)) {
+ next({
+ status: 400,
+ message: 'Wrong/No filter specified'
+ });
+ }
+ if ("city" in req.filter) {
+ req.sql.from('adh_idh')
+ .field('adh_idh.idhm_e', 'total')
+ .field('adh_idh.ano_censo', 'year')
+ .field('adh_idh.municipio_id', 'city_id');
+ } else {
// console.log("sim");
req.sql.from('adh_idh_uf')
.field('adh_idh_uf.idhm_e', 'total')
.field('adh_idh_uf.ano_censo', 'year')
.field('adh_idh_uf.estado_id', 'state_id');
- } else if ("city" in req.filter) {
- req.sql.from('adh_idh')
- .field('adh_idh.idhm_e', 'IDHME')
- .field('adh_idh.ano_censo', 'year')
- .field('adh_idh.municipio_id', 'city_id');
- } else {
- next({
- status: 400,
- message: 'Wrong/No filter specified'
- });
}
next();
}, rqf.build(), query, response('idhme'));
diff --git a/src/libs/routes/idhml.js b/src/libs/routes/idhml.js
new file mode 100644
index 0000000000000000000000000000000000000000..81b920cdaefd83a7ab0a72f438c7d022f311c2e1
--- /dev/null
+++ b/src/libs/routes/idhml.js
@@ -0,0 +1,131 @@
+const express = require('express');
+
+const idhmlApp = express.Router();
+
+const libs = `${process.cwd()}/libs`;
+
+const squel = require('squel');
+
+const query = require(`${libs}/middlewares/query`);
+
+const response = require(`${libs}/middlewares/response`);
+
+const id2str = require(`${libs}/middlewares/id2str`);
+
+const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
+
+let rqf = new ReqQueryFields();
+
+idhmlApp.get('/year_range', (req, res, next) => {
+ req.sql.from('adh_idh')
+ .field('MIN(adh_idh.ano_censo)', 'start_year')
+ .field('MAX(adh_idh.ano_censo)', 'end_year');
+ next();
+}, query, (req, res, next) => {
+ req.sql.from('adh_idh_uf')
+ .field('MIN(adh_idh_uf.ano_censo)', 'start_year')
+ .field('MAX(adh_idh_uf.ano_censo)', 'end_year');
+ req.old_result = req.result;
+ next();
+}, query, (req, res, next) => {
+ // console.log(req.old_result[0].start_year);
+ // console.log(req.result[0].start_year);
+ if (req.old_result[0].start_year < req.result[0].start_year) {
+ req.result[0].start_year = req.old_result[0].start_year;
+ }
+ if (req.old_result[0].end_year > req.result[0].end_year) {
+ req.result[0].end_year = req.old_result[0].old_result;
+ }
+ next();
+}, query, response('range'));
+
+rqf.addField({
+ name: 'filter',
+ field: false,
+ where: true
+}).addValue({
+ name: 'city',
+ table: 'municipio',
+ tableField: 'nome',
+ resultField: 'city_name',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'municipio_id',
+ table: 'adh_idh'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'municipio_id',
+ foreignTable: 'adh_idh'
+ }
+}).addValue({
+ name: 'min_year',
+ table: '@',
+ tableField: 'ano_censo',
+ resultField: 'year',
+ where: {
+ relation: '>=',
+ type: 'integer',
+ table: '@',
+ field: 'ano_censo'
+ }
+}).addValue({
+ name: 'max_year',
+ table: '@',
+ tableField: 'ano_censo',
+ resultField: 'year',
+ where: {
+ relation: '<=',
+ type: 'integer',
+ table: '@',
+ field: 'ano_censo'
+ }
+}).addValue({
+ name: 'state',
+ table: 'estado',
+ tableField: 'nome',
+ resultField: 'state_name',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'estado_id',
+ table: '@'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'estado_id',
+ foreignTable: '@'
+ }
+});
+
+idhmlApp.get('/', rqf.parse(), (req, res, next) => {
+ if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0) {
+ res.status(400);
+ next({
+ status: 400,
+ message: 'Wrong/No filter specified'
+ });
+ }
+ if (!("state" in req.filter) && !("city" in req.filter)) {
+ next({
+ status: 400,
+ message: 'Wrong/No filter specified'
+ });
+ }
+ if ("city" in req.filter) {
+ req.sql.from('adh_idh')
+ .field('adh_idh.idhm_l', 'total')
+ .field('adh_idh.ano_censo', 'year')
+ .field('adh_idh.municipio_id', 'city_id');
+ } else {
+ // console.log("sim");
+ req.sql.from('adh_idh_uf')
+ .field('adh_idh_uf.idhm_l', 'total')
+ .field('adh_idh_uf.ano_censo', 'year')
+ .field('adh_idh_uf.estado_id', 'state_id');
+ }
+ next();
+}, rqf.build(), query, response('idhml'));
+
+module.exports = idhmlApp;
diff --git a/src/libs/routes/pibpercapita.js b/src/libs/routes/pibpercapita.js
index e0a6409362c378cd11a1fe4aff0e4e89dd08e8f1..9195806ca1f26ac696162d48d78053d5c66fb326 100644
--- a/src/libs/routes/pibpercapita.js
+++ b/src/libs/routes/pibpercapita.js
@@ -117,6 +117,6 @@ pibpercapitaApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.order('ibge_pib.ano_censo')
next();
-}, query, id2str.transform(true), response('pibpercapita'));
+}, query, id2str.transform(false), response('pibpercapita'));
module.exports = pibpercapitaApp;
diff --git a/src/libs/routes/population.js b/src/libs/routes/population.js
index f2a89783ddad50859cdffeeb38a8d7b76f89a507..f7777c173d7e668f55eb79c3ec9b1a6b7055643f 100644
--- a/src/libs/routes/population.js
+++ b/src/libs/routes/population.js
@@ -136,6 +136,6 @@ populationApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.order('ibge_populacao.ano_censo')
next();
-}, query, id2str.transform(true), response('population'));
+}, query, id2str.transform(false), response('population'));
module.exports = populationApp;
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 5320c29fbb3810d6c0b8b71492bbfe64e25c208a..f963e23d2e60977209b46b507e980e0febf93e38 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -848,7 +848,6 @@ rqfCount.addField({
// SELECT COUNT(escola.id) AS "total", 'Brasil' AS "name", escola.ano_censo AS "year" FROM escola WHERE (escola.biblioteca = ? OR escola.sala_leitura = ? OR escola.biblioteca_sala_leitura) AND (escola.situacao_de_funcionamento = 1 AND escola.ensino_regular = 1) GROUP BY escola.ano_censo ORDER BY escola.ano_censo ASC
schoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
- console.log(req.filter);
if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0) {
res.status(400);
next({
diff --git a/src/test/class.js b/src/test/class.js
index c6fd205a5c0c48fd72c6d49d1846fc1682269159..8b6039ccf3131139fe4f85fbe50861f52b653b66 100644
--- a/src/test/class.js
+++ b/src/test/class.js
@@ -110,7 +110,7 @@ describe('request class', () => {
it('should list the periods', (done) => {
chai.request(server)
- .get('/api/v1/enrollment/period')
+ .get('/api/v1/class/period')
.end((err, res) => {
res.should.have.status(200);
res.should.be.json;
diff --git a/src/test/classroom.js b/src/test/classroom.js
index bd520cf8b67ad396f8251092bf0a4036bb65e36a..08950d6875fb2bda4562943ef9be6177f748814a 100644
--- a/src/test/classroom.js
+++ b/src/test/classroom.js
@@ -251,7 +251,7 @@ describe('request classrooms', () => {
it('should list classrooms with invalid dimensions', (done) => {
chai.request(server)
- .get('/api/v1/class?dims=foo,bar')
+ .get('/api/v1/classroom?dims=foo,bar')
.end((err, res) => {
res.should.have.status(200);
res.should.be.json;
diff --git a/src/test/idhml.js b/src/test/idhml.js
new file mode 100644
index 0000000000000000000000000000000000000000..c3409bb45bb7fb97c95567847b837a9d153cb9ae
--- /dev/null
+++ b/src/test/idhml.js
@@ -0,0 +1,80 @@
+process.env.NODE_ENV = 'test';
+
+const chai = require('chai');
+
+const dirtyChai = require('dirty-chai');
+
+chai.use(dirtyChai);
+
+const chaiXml = require('chai-xml');
+
+chai.use(chaiXml);
+
+const chaiHttp = require('chai-http');
+
+const assert = chai.assert;
+
+const expect = chai.expect;
+
+const should = chai.should(); // actually call the function
+
+const libs = `${process.cwd()}/libs`;
+
+const server = require(`${libs}/app`);
+
+chai.use(chaiHttp);
+describe('request idhml', () => {
+ it('should list the year range', (done) => {
+ chai.request(server)
+ .get('/api/v1/idhml/year_range')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('start_year');
+ res.body.result[0].should.have.property('end_year');
+ done();
+ });
+ });
+
+ it('should list idhml with valid filters', (done) => {
+ chai.request(server)
+ .get('/api/v1/idhml?filter=min_year:2000,state:41')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('total');
+ res.body.result[0].should.have.property('year');
+ res.body.result[0].should.have.property('state_id');
+ done();
+ });
+ });
+
+ it('should list idhml with invalid filters', (done) => {
+ chai.request(server)
+ .get('/api/v1/idhml?filter=foo:2010,bar:41')
+ .end((err, res) => {
+ res.should.have.status(400);
+ res.should.be.json;
+ res.body.should.have.property('error');
+ res.body.error.should.be.equal('Wrong/No filter specified');
+ done();
+ });
+ });
+
+ it('should return 400 with no filters', (done) => {
+ chai.request(server)
+ .get('/api/v1/idhml')
+ .end((err, res) => {
+ res.should.have.status(400);
+ res.should.be.json;
+ res.body.should.have.property('error');
+ res.body.error.should.be.equal('Wrong/No filter specified');
+ done();
+ })
+ });
+
+});
diff --git a/src/test/schoolCount.js b/src/test/schoolCount.js
index 59c100000b03263bab56c12fc895339a08d764f6..b40b408247dcc988e81efc92b882f58618b6913a 100644
--- a/src/test/schoolCount.js
+++ b/src/test/schoolCount.js
@@ -389,34 +389,6 @@ describe('request schools count', () => {
});
});
- it('should list the education begin elementary school', (done) => {
- chai.request(server)
- .get('/api/v1/school/education_begin_elementary_school')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('id');
- res.body.result[0].should.have.property('name');
- done();
- });
- });
-
- it('should list the education end elementary school', (done) => {
- chai.request(server)
- .get('/api/v1/school/education_end_elementary_school')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('id');
- res.body.result[0].should.have.property('name');
- done();
- });
- });
-
it('should list the education middle school', (done) => {
chai.request(server)
.get('/api/v1/school/education_middle_school')
@@ -539,21 +511,6 @@ describe('request schools count', () => {
});
});
- it('should list school with valid dimensions and filters of states', (done) => {
- chai.request(server)
- .get('/api/v1/school/count?dims=state&filter=min_year:2015,max_year:2016')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('state_name');
- res.body.result[0].should.have.property('total');
- res.body.result[0].should.have.property('year');
- done();
- });
- });
-
it('should list school with valid dimensions and filters of states', (done) => {
chai.request(server)
.get('/api/v1/school/count?dims=state,education_professional,education_eja&filter=min_year:2015,max_year:2016')