diff --git a/src/libs/routes/class.js b/src/libs/routes/class.js index 6de499d9fda8f7f63ff66320b6518082ce2eb7eb..39291ddc4ab0073823c2b34972638da0e2f751ed 100644 --- a/src/libs/routes/class.js +++ b/src/libs/routes/class.js @@ -69,12 +69,12 @@ classApp.get('/integral_time', (req, res, next) => { }, response('integral_time')); // Returns all educational levels avaible -classApp.get('/education_level', (req, res, next) => { +classApp.get('/education_level_mod', (req, res, next) => { req.sql.from('etapas_mod_ensino_segmento') .field('id') .field('nome', 'name'); next(); -}, query, response('education_level')); +}, query, response('education_level_mod')); rqfCount.addField({ name: 'filter', @@ -172,10 +172,10 @@ rqfCount.addField({ field: 'localizacao_id' } }).addValue({ - name:'education_level', + name:'education_level_mod', table: 'turma', tableField: 'etapas_mod_ensino_segmento_id', - resultField: 'education_level_id', + resultField: 'education_level_mod_id', where: { relation: '=', type: 'integer', diff --git a/src/test/class.js b/src/test/class.js index bcc0660acdf60b7bb38a1a7fc065512f8ff6c365..32f89e3bacec3313f59067b8ff1102da230b037b 100644 --- a/src/test/class.js +++ b/src/test/class.js @@ -40,7 +40,7 @@ describe('request class', () => { it('should list the education level', (done) => { chai.request(server) - .get('/api/v1/class/education_level') + .get('/api/v1/class/education_level_mod') .end((err, res) => { res.should.have.status(200); res.should.be.json; @@ -155,7 +155,7 @@ describe('request class', () => { it('should list class with valid dimensions and filters', (done) => { chai.request(server) - .get('/api/v1/class?dims=region,state,education_level,school,period&filter=min_year:2015,max_year:2015,city:4106902') + .get('/api/v1/class?dims=region,state,education_level_mod,school,period&filter=min_year:2015,max_year:2015,city:4106902') .end((err, res) => { res.should.have.status(200); res.should.be.json; @@ -164,7 +164,7 @@ describe('request class', () => { 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_name'); + res.body.result[0].should.have.property('education_level_mod_name'); res.body.result[0].should.have.property('total'); res.body.result[0].should.have.property('year'); done();