diff --git a/config.json b/config.json.example
similarity index 85%
rename from config.json
rename to config.json.example
index cdcbd4ae700d803b4300cb1743ee087ecb4f6079..86ca6784a92ef8935b066c1f90585a3c48f0d23c 100644
--- a/config.json
+++ b/config.json.example
@@ -1,9 +1,9 @@
{
"port": 3000,
"ip": "127.0.0.1",
- "debug" : true,
+ "debug" : false,
"monetdb": {
- "host": "127.0.0.1",
+ "host": "simcaqdb3.c3sl.ufpr.br",
"port": 50000,
"dbname": "simcaq_dev",
"user": "monetdb",
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index f9436ee9077a570858e2368e75c2c0ed370d0022..563dfac93e840a304a15e10769deb69db755195d 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -73,7 +73,7 @@ gulp.task('pre-test', () => {
gulp.task('test', ['pre-test'], () => {
process.chdir('build');
- gulp.src('test/test.js', {read: false})
+ gulp.src('test/**/*.js', {read: false})
.pipe(mocha({timeout: 15000}))
.pipe(istanbul.writeReports())
.pipe(istanbul.enforceThresholds({
diff --git a/src/libs/routes/city.js b/src/libs/routes/city.js
index 733da6f341cc37a7b6b792b8f5383076eae75067..3bccfebf6fffc1153b553f8ebe11bf00d934d033 100644
--- a/src/libs/routes/city.js
+++ b/src/libs/routes/city.js
@@ -12,27 +12,44 @@ const response = require(`${libs}/middlewares/response`);
// Return all cities
cityApp.get('/', (req, res, next) => {
- req.sql.from('municipios');
+ req.sql.from('municipio')
+ .field('pk_cod_ibge', 'pk_municipio_id')
+ .field('nome')
+ .field('pk_cod_ibge', 'codigo_ibge')
+ .field('fk_estado_id');
next();
}, query, response('city'));
// Return a specific city by it's id
cityApp.get('/:id', (req, res, next) => {
- req.sql.from('municipios')
- .where('pk_municipio_id = ?', parseInt(req.params.id, 10));
+ req.sql.from('municipio')
+ .field('pk_cod_ibge', 'pk_municipio_id')
+ .field('nome', 'nome')
+ .field('pk_cod_ibge', 'codigo_ibge')
+ .field('fk_estado_id')
+ .where('pk_cod_ibge = ?', parseInt(req.params.id, 10));
next();
}, query, response('city'));
// Return a specific city by it's IBGE code
+// TODO: this route becomes obsolete in the new schema, deprecate it
cityApp.get('/ibge/:id', (req, res, next) => {
- req.sql.from('municipios')
- .where('codigo_ibge = ?', req.params.id);
+ req.sql.from('municipio')
+ .field('pk_cod_ibge', 'pk_municipio_id')
+ .field('nome')
+ .field('fk_estado_id')
+ .field('pk_cod_ibge', 'codigo_ibge')
+ .where('pk_cod_ibge = ?', parseInt(req.params.id, 10));
next();
}, query, response('city'));
// Return all the cities from a specific state
cityApp.get('/state/:id', (req, res, next) => {
- req.sql.from('municipios')
+ req.sql.from('municipio')
+ .field('pk_cod_ibge', 'pk_municipio_id')
+ .field('nome')
+ .field('pk_cod_ibge', 'codigo_ibge')
+ .field('fk_estado_id')
.where('fk_estado_id = ?', parseInt(req.params.id, 10));
next();
}, query, response('city'));
diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index fd8ff2a793e3f73490b36c06f5bfcb5c2168c48d..948682955479f0988dbd0099bbdd2d1e0ed4fcee 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -82,7 +82,7 @@ enrollmentApp.use('/', parseParams('filter', [
if(typeof req.filter.education_level !== 'undefined'
|| typeof req.dims.education_level !== 'undefined') {
req.sql.join('etapa_ensino', null,
- 'fk_etapa_ensino_id = etapa_ensino.pk_etapa_ensino_id');
+ 'turma.fk_etapa_ensino_id = etapa_ensino.pk_etapa_ensino_id');
}
if(typeof req.filter.region !== 'undefined'
@@ -139,14 +139,21 @@ enrollmentApp.use('/', parseParams('filter', [
.order('municipio.nome');
}
- /*
+ /**
+ * TODO: field nome_entidade is not present in the new schema, remove this part
if(typeof req.dims.school !== 'undefined') {
- req.sql.field('escolas.nome_entidade', 'school_name')
- .group('escolas.nome_entidade')
- .order('escolas.nome_entidade');
+ req.sql.field('escola.nome_entidade', 'school_name')
+ .group('escola.nome_entidade')
+ .order('escola.nome_entidade');
}
*/
+ if(typeof req.dims.school !== 'undefined') {
+ req.sql.field('escola.cod_entidade', 'school_code')
+ .group('escola.cod_entidade')
+ .order('escola.cod_entidade');
+ }
+
if(typeof req.dims.adm_dependency !== 'undefined') {
req.sql.field('dependencia_adm.nome', 'adm_dependency_name')
.group('dependencia_adm.nome')
@@ -201,7 +208,7 @@ enrollmentApp.use('/', parseParams('filter', [
}
if (typeof req.filter.school !== 'undefined') {
- req.sql.where('turma.fk_escola_id = ?', parseInt(req.filter.school, 10));
+ req.sql.where('turma.cod_entidade = ?', parseInt(req.filter.school, 10));
}
log.debug(req.sql.toParam());
next();
diff --git a/src/libs/routes/location.js b/src/libs/routes/location.js
index 159b1dbd6ae129e51c60be277588d4f38224dd16..0a1245741d914ec48b522f6dc785c35d1e81d146 100644
--- a/src/libs/routes/location.js
+++ b/src/libs/routes/location.js
@@ -36,25 +36,14 @@ function locationIdToStr(locationId) {
function processResultSet(querySet, querySetLabels = ["result"]) {
const resultMap = new Map();
- if (querySetLabels.length === 1 && querySetLabels[0] === "result") {
- resultMap["result"] = [];
- // loop relies on the fact that Promise.all maintains the order of the original iterable
- for(let result of querySet) {
- // each query only returns one object in an array, so we get rid of the array
- const resultObj = result[0];
- resultMap["result"].push(resultObj);
- resultIdx++;
- }
- } else {
- let resultIdx = 0;
- // loop relies on the fact that Promise.all maintains the order of the original iterable
- for(let result of querySet) {
- const resultLbl = querySetLabels[resultIdx];
- // each query only returns one object in an array, so we get rid of the array
- const resultObj = result[0];
- resultMap[resultLbl] = resultObj;
- resultIdx++;
- }
+ let resultIdx = 0;
+ // loop relies on the fact that Promise.all maintains the order of the original iterable
+ for(let result of querySet) {
+ const resultLbl = querySetLabels[resultIdx];
+ // each query only returns one object in an array, so we get rid of the array
+ const resultObj = result[0];
+ resultMap[resultLbl] = resultObj;
+ resultIdx++;
}
log.debug(resultMap);
return resultMap;
diff --git a/src/libs/routes/region.js b/src/libs/routes/region.js
index 773ad347959049dd2137d96abb255a3bc809a2d4..0a8b65f860655e71e7aaf4f1b6211a37d481199c 100644
--- a/src/libs/routes/region.js
+++ b/src/libs/routes/region.js
@@ -12,13 +12,13 @@ const response = require(`${libs}/middlewares/response`);
// Get all regions
regionApp.get('/', (req, res, next) => {
- req.sql.from('regioes');
+ req.sql.from('regiao');
next();
}, query, response('region'));
// Get a region by it's id
regionApp.get('/:id', (req, res, next) => {
- req.sql.from('regioes')
+ req.sql.from('regiao')
.where('pk_regiao_id = ?', parseInt(req.params.id, 10));
next();
}, query, response('region'));
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 6c92430b425d3b9fde8c682216c8f6a10f07b75f..ec415a868b1cd4bac133813b7c3a3c2a9fa9ef5a 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -28,32 +28,35 @@ const response = require(`${libs}/middlewares/response`);
// Get a school by it's id
schoolApp.get('/:id', (req, res, next) => {
- req.sql.from('escolas')
- .where('pk_escola_id = ?', parseInt(req.params.id, 10));
+ req.sql.from('escola')
+ .field('cod_entidade', 'pk_escola_id')
+ .field('cod_entidade')
+ .field('ano_censo')
+ .field('fk_municipio_id')
+ .field('fk_estado_id')
+ .where('cod_entidade = ?', parseInt(req.params.id, 10));
next();
}, query, response('school'));
// Get all schools from a state
schoolApp.get('/state/:id', (req, res, next) => {
- req.sql.from('escolas')
- .field('pk_escola_id')
- .field('nome_entidade')
+ req.sql.from('escola')
+ .field('cod_entidade', 'pk_escola_id')
+ .field('cod_entidade')
.field('ano_censo')
- .field('fk_cod_estado')
- .field('fk_cod_municipio')
- .where('fk_cod_estado = ?', parseInt(req.params.id, 10));
+ .field('fk_municipio_id')
+ .where('fk_estado_id = ?', parseInt(req.params.id, 10));
next();
}, query, response('school'));
// Get all schools from a city
schoolApp.get('/city/:id', (req, res, next) => {
- req.sql.from('escolas')
- .field('pk_escola_id')
- .field('nome_entidade')
+ req.sql.from('escola')
+ .field('cod_entidade', 'pk_escola_id')
+ .field('cod_entidade')
.field('ano_censo')
- .field('fk_cod_estado')
- .field('fk_cod_municipio')
- .where('fk_cod_municipio = ?', parseInt(req.params.id, 10));
+ .field('fk_estado_id')
+ .where('fk_municipio_id = ?', parseInt(req.params.id, 10));
next();
}, query, response('school'));
diff --git a/src/libs/routes/simulation.js b/src/libs/routes/simulation.js
new file mode 100644
index 0000000000000000000000000000000000000000..d197b39d1c107935bef0775bcfce31ca4b7b75b5
--- /dev/null
+++ b/src/libs/routes/simulation.js
@@ -0,0 +1,47 @@
+const express = require('express');
+
+const libs = `${process.cwd()}/libs`;
+
+const squel = require('squel');
+
+const query = require(`${libs}/middlewares/query`);
+
+const response = require(`${libs}/middlewares/response`);
+
+const simulationApp = express();
+
+simulationApp.get('/', (req, res, next) => {
+ req.sql = squel.select().from('simulacao').toParam();
+ next();
+}, query, response('simulacao'));
+
+simulationApp.get('/:uid:/all', (req, res, next) => {
+ // TODO: implement user checking
+
+ req.sql = squel.select().from('simulacao').toParam();
+ next();
+}, query, response('simulacao'));
+
+simulationApp.get('/:uid:/:simulation_id:/view', (req, res, next) => {
+ // TODO: implement checking if the simulation belongs to the current user
+
+ req.sql = squel.select().from('simulacao').toParam();
+ next();
+});
+
+simulationApp.get('/:uid:/:simulation_id:/delete', (req, res, next) => {
+ // TODO: implement checking if the simulation belongs to the current user
+
+ req.sql = squel.select().from('simulacao').toParam();
+ next();
+});
+
+simulationApp.get('/:uid:/:simulation_id:/edit', (req, res, next) => {
+ // TODO: implement checking if the simulation belongs to the current user
+
+ req.sql = squel.select().from('simulacao').toParam();
+ next();
+});
+
+module.exports = simulationApp;
+
diff --git a/src/libs/routes/state.js b/src/libs/routes/state.js
index 75e1c0b7835901804ea78e459b1fe0050ec03631..8567ec05f7448fcbf3ebe00fefbc9d5e6e48de27 100644
--- a/src/libs/routes/state.js
+++ b/src/libs/routes/state.js
@@ -12,20 +12,20 @@ const response = require(`${libs}/middlewares/response`);
// Get all states
stateApp.get('/', (req, res, next) => {
- req.sql.from('estados');
+ req.sql.from('estado');
next();
}, query, response('state'));
// Get a state
stateApp.get('/:id', (req, res, next) => {
- req.sql.from('estados')
+ req.sql.from('estado')
.where('pk_estado_id = ?', parseInt(req.params.id, 10));
next();
}, query, response('state'));
// Get all states from a region
stateApp.get('/region/:id', (req, res, next) => {
- req.sql.from('estados')
+ req.sql.from('estado')
.where('fk_regiao_id = ?', parseInt(req.params.id, 10));
next();
}, query, response('state'));
diff --git a/src/test/city.js b/src/test/city.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb5f40992a65322dd620641166ca6285e37f6ab5
--- /dev/null
+++ b/src/test/city.js
@@ -0,0 +1,93 @@
+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 cities', () => {
+ it('should list all cities', (done) => {
+ chai.request(server)
+ .get('/api/v1/city')
+ .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('pk_municipio_id');
+ res.body.result[0].should.have.property('fk_estado_id');
+ res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('codigo_ibge');
+ done();
+ });
+ });
+
+ it('should list a city by id', (done) => {
+ chai.request(server)
+ .get('/api/v1/city/4106902')
+ .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('pk_municipio_id');
+ res.body.result[0].should.have.property('fk_estado_id');
+ res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('codigo_ibge');
+ done();
+ });
+ });
+
+ it('should list a city by codigo_ibge', (done) => {
+ chai.request(server)
+ .get('/api/v1/city/ibge/1200013')
+ .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('pk_municipio_id');
+ res.body.result[0].should.have.property('fk_estado_id');
+ res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('codigo_ibge');
+ done();
+ });
+ });
+
+ it('should list all cities from a state', (done) => {
+ chai.request(server)
+ .get('/api/v1/city/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('pk_municipio_id');
+ res.body.result[0].should.have.property('fk_estado_id');
+ res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('codigo_ibge');
+ done();
+ })
+ })
+});
+
diff --git a/src/test/enrollment.js b/src/test/enrollment.js
new file mode 100644
index 0000000000000000000000000000000000000000..328b88d9d07697d48e9f3a66865374e44e49f260
--- /dev/null
+++ b/src/test/enrollment.js
@@ -0,0 +1,181 @@
+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 enrollments', () => {
+ it('should list the year range', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment/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 the education level', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment/education_level')
+ .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 administrative dependencies', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment/adm_dependency ')
+ .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 enrollments', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment')
+ .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('name');
+ res.body.result[0].should.have.property('total');
+ done();
+ });
+ });
+
+ it('should list enrollments with valid filters', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?filter=min_year:2014,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('name');
+ res.body.result[0].should.have.property('total');
+ done();
+ });
+ });
+
+ it('should list enrollments with invalid filters', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?filter=foo:2010,bar: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('name');
+ res.body.result[0].should.have.property('total');
+ done();
+ });
+ });
+
+ it('should list enrollments with valid dimensions', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?dims=region,state,adm_dependency,location&filter=min_year:2014,region:4')
+ .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('region_name');
+ res.body.result[0].should.have.property('state_name');
+ res.body.result[0].should.have.property('adm_dependency_name');
+ res.body.result[0].should.have.property('location_name');
+ res.body.result[0].should.have.property('total');
+ done();
+ });
+ });
+
+ it('should list enrollments with invalid dimensions', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?dims=foo,bar')
+ .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('name');
+ res.body.result[0].should.have.property('total');
+ done();
+ });
+ });
+
+ it('should list enrollments with valid dimensions and filters', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?dims=region,state,education_level,school&filter=min_year:2013,max_year:2014,city:4106902')
+ .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('region_name');
+ res.body.result[0].should.have.property('state_name');
+ //res.body.result[0].should.have.property('school_name');
+ res.body.result[0].should.have.property('education_level');
+ res.body.result[0].should.have.property('total');
+ res.body.result[0].should.have.property('year');
+ done();
+ });
+ });
+
+ it('should list enrollments using all dimensions and filters', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?dims=region,state,city,education_level,school,adm_dependency,location&filter=min_year:2013,max_year:2014,city:4106902,adm_dependency:3,location:1,education_level:99')
+ .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('region_name');
+ res.body.result[0].should.have.property('state_name');
+ //res.body.result[0].should.have.property('school_name');
+ res.body.result[0].should.have.property('education_level');
+ res.body.result[0].should.have.property('location_name');
+ res.body.result[0].should.have.property('adm_dependency_name');
+ res.body.result[0].should.have.property('total');
+ res.body.result[0].should.have.property('year');
+ done();
+ });
+ });
+
+
+});
diff --git a/src/test/region.js b/src/test/region.js
new file mode 100644
index 0000000000000000000000000000000000000000..a2f67d2f879dc45eb80f878089a24e2ffed3464c
--- /dev/null
+++ b/src/test/region.js
@@ -0,0 +1,56 @@
+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 regions', () => {
+ it('should list all regions', (done) => {
+ chai.request(server)
+ .get('/api/v1/region')
+ .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('pk_regiao_id');
+ res.body.result[0].should.have.property('nome');
+ done();
+ });
+ });
+
+ it('should list region by id', (done) => {
+ chai.request(server)
+ .get('/api/v1/region/1')
+ .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.should.have.length(1);
+ res.body.result[0].should.have.property('pk_regiao_id');
+ res.body.result[0].should.have.property('nome');
+ done();
+ });
+ });
+});
diff --git a/src/test/school.js b/src/test/school.js
new file mode 100644
index 0000000000000000000000000000000000000000..01d44b0292ff90110f8dcc4448c2ef23030844ab
--- /dev/null
+++ b/src/test/school.js
@@ -0,0 +1,75 @@
+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 schools', () => {
+ it('should list a school by id', (done) => {
+ chai.request(server)
+ .get('/api/v1/school/11000023')
+ .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('pk_escola_id');
+ res.body.result[0].should.have.property('ano_censo');
+ res.body.result[0].should.have.property('cod_entidade');
+ //res.body.result[0].should.have.property('nome_entidade');
+ done();
+ });
+ });
+
+ it('should list all schools from a state', (done) => {
+ chai.request(server)
+ .get('/api/v1/school/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('pk_escola_id');
+ res.body.result[0].should.have.property('ano_censo');
+ res.body.result[0].should.have.property('cod_entidade');
+ //res.body.result[0].should.have.property('nome_entidade');
+ done();
+ });
+ });
+
+ it('should list all schools from a city', (done) => {
+ chai.request(server)
+ .get('/api/v1/school/city/4102802')
+ .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('pk_escola_id');
+ res.body.result[0].should.have.property('ano_censo');
+ res.body.result[0].should.have.property('cod_entidade');
+ //res.body.result[0].should.have.property('nome_entidade');
+ done();
+ })
+ })
+});
diff --git a/src/test/state.js b/src/test/state.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a2230fbeaad71e7cc2a5c5071c86c6a0d61255e
--- /dev/null
+++ b/src/test/state.js
@@ -0,0 +1,75 @@
+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 states', () => {
+ it('should list all states', (done) => {
+ chai.request(server)
+ .get('/api/v1/state')
+ .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('pk_estado_id');
+ res.body.result[0].should.have.property('fk_regiao_id');
+ res.body.result[0].should.have.property('nome');
+ done();
+ });
+ });
+
+ it('should list a state by id', (done) => {
+ chai.request(server)
+ .get('/api/v1/state/11')
+ .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.should.have.length(1);
+ res.body.result[0].should.have.property('pk_estado_id');
+ res.body.result[0].should.have.property('fk_regiao_id');
+ res.body.result[0].should.have.property('nome');
+ done();
+ });
+ });
+
+ it('should list states by region id', (done) => {
+ chai.request(server)
+ .get('/api/v1/state/region/1')
+ .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('pk_estado_id');
+ res.body.result[0].should.have.property('fk_regiao_id');
+ res.body.result[0].should.have.property('nome');
+ done();
+ });
+ });
+});
+
diff --git a/src/test/test.js b/src/test/test.js
deleted file mode 100644
index 110be7d6273b1e9f2b33e1ba115c556ac25106cd..0000000000000000000000000000000000000000
--- a/src/test/test.js
+++ /dev/null
@@ -1,419 +0,0 @@
-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('API is running', () => {
- it('should respond it\'s running', (done) => {
- chai.request(server)
- .get('/api/v1')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('msg');
- done();
- })
- });
-});
-
-describe('request enrollments', () => {
- it('should list the year range', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment/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 the education level', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment/education_level')
- .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 administrative dependencies', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment/adm_dependency ')
- .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 enrollments', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment')
- .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('name');
- res.body.result[0].should.have.property('total');
- done();
- });
- });
-
- it('should list enrollments with valid filters', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment?filter=min_year:2010,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('name');
- res.body.result[0].should.have.property('total');
- done();
- });
- });
-
- it('should list enrollments with invalid filters', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment?filter=foo:2010,bar: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('name');
- res.body.result[0].should.have.property('total');
- done();
- });
- });
-
- it('should list enrollments with valid dimensions', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment?dims=region,state,adm_dependency,location&filter=min_year:2014,region:4')
- .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('region_name');
- res.body.result[0].should.have.property('state_name');
- res.body.result[0].should.have.property('adm_dependency_name');
- res.body.result[0].should.have.property('location_name');
- res.body.result[0].should.have.property('total');
- done();
- });
- });
-
- it('should list enrollments with invalid dimensions', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment?dims=foo,bar')
- .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('name');
- res.body.result[0].should.have.property('total');
- done();
- });
- });
-
- it('should list enrollments with valid dimensions and filters', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment?dims=region,state,education_level,school&filter=min_year:2013,max_year:2014,city:3287')
- .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('region_name');
- res.body.result[0].should.have.property('state_name');
- res.body.result[0].should.have.property('school_name');
- res.body.result[0].should.have.property('education_level');
- res.body.result[0].should.have.property('total');
- res.body.result[0].should.have.property('year');
- done();
- });
- });
-
- it('should list enrollments using all dimensions and filters', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment?dims=region,state,city,education_level,school,adm_dependency,location&filter=min_year:2013,max_year:2014,city:3287,adm_dependency:3,location:1,education_level:99')
- .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('region_name');
- res.body.result[0].should.have.property('state_name');
- res.body.result[0].should.have.property('school_name');
- res.body.result[0].should.have.property('education_level');
- res.body.result[0].should.have.property('location_name');
- res.body.result[0].should.have.property('adm_dependency_name');
- res.body.result[0].should.have.property('total');
- res.body.result[0].should.have.property('year');
- done();
- });
- });
-
-
-});
-
-describe('request regions', () => {
- it('should list all regions', (done) => {
- chai.request(server)
- .get('/api/v1/region')
- .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('pk_regiao_id');
- res.body.result[0].should.have.property('nome');
- done();
- });
- });
-
- it('should list region by id', (done) => {
- chai.request(server)
- .get('/api/v1/region/1')
- .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.should.have.length(1);
- res.body.result[0].should.have.property('pk_regiao_id');
- res.body.result[0].should.have.property('nome');
- done();
- });
- });
-});
-
-describe('request states', () => {
- it('should list all states', (done) => {
- chai.request(server)
- .get('/api/v1/state')
- .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('pk_estado_id');
- res.body.result[0].should.have.property('fk_regiao_id');
- res.body.result[0].should.have.property('nome');
- done();
- });
- });
-
- it('should list a state by id', (done) => {
- chai.request(server)
- .get('/api/v1/state/11')
- .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.should.have.length(1);
- res.body.result[0].should.have.property('pk_estado_id');
- res.body.result[0].should.have.property('fk_regiao_id');
- res.body.result[0].should.have.property('nome');
- done();
- });
- });
-
- it('should list states by region id', (done) => {
- chai.request(server)
- .get('/api/v1/state/region/1')
- .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('pk_estado_id');
- res.body.result[0].should.have.property('fk_regiao_id');
- res.body.result[0].should.have.property('nome');
- done();
- });
- });
-});
-
-describe('request cities', () => {
- it('should list all cities', (done) => {
- chai.request(server)
- .get('/api/v1/city')
- .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('pk_municipio_id');
- res.body.result[0].should.have.property('fk_estado_id');
- res.body.result[0].should.have.property('nome');
- res.body.result[0].should.have.property('codigo_ibge');
- done();
- });
- });
-
- it('should list a city by id', (done) => {
- chai.request(server)
- .get('/api/v1/city/1')
- .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('pk_municipio_id');
- res.body.result[0].should.have.property('fk_estado_id');
- res.body.result[0].should.have.property('nome');
- res.body.result[0].should.have.property('codigo_ibge');
- done();
- });
- });
-
- it('should list a city by codigo_ibge', (done) => {
- chai.request(server)
- .get('/api/v1/city/ibge/1200013')
- .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('pk_municipio_id');
- res.body.result[0].should.have.property('fk_estado_id');
- res.body.result[0].should.have.property('nome');
- res.body.result[0].should.have.property('codigo_ibge');
- done();
- });
- });
-
- it('should list all cities from a state', (done) => {
- chai.request(server)
- .get('/api/v1/city/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('pk_municipio_id');
- res.body.result[0].should.have.property('fk_estado_id');
- res.body.result[0].should.have.property('nome');
- res.body.result[0].should.have.property('codigo_ibge');
- done();
- })
- })
-});
-
-describe('request schools', () => {
- it('should list a school by id', (done) => {
- chai.request(server)
- .get('/api/v1/school/185588')
- .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('pk_escola_id');
- res.body.result[0].should.have.property('ano_censo');
- res.body.result[0].should.have.property('cod_entidade');
- res.body.result[0].should.have.property('nome_entidade');
- done();
- });
- });
-
- it('should list all schools from a state', (done) => {
- chai.request(server)
- .get('/api/v1/school/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('pk_escola_id');
- res.body.result[0].should.have.property('ano_censo');
- res.body.result[0].should.have.property('nome_entidade');
- done();
- });
- });
-
- it('should list all schools from a city', (done) => {
- chai.request(server)
- .get('/api/v1/school/city/3287')
- .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('pk_escola_id');
- res.body.result[0].should.have.property('ano_censo');
- res.body.result[0].should.have.property('nome_entidade');
- done();
- })
- })
-});
-
-describe('test response', () => {
- it('should list all regions in json', (done) => {
- chai.request(server)
- .get('/api/v1/region')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- done();
- });
- });
-
- it('should list all regions in xml', (done) => {
- chai.request(server)
- .get('/api/v1/region?format=xml')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.xml;
- done();
- });
- });
-
- it('should list all regions in csv', (done) => {
- chai.request(server)
- .get('/api/v1/region?format=csv')
- .end((err, res) => {
- res.should.have.status(200);
- done();
- });
- });
-});