Merge branch 'fix_education_level_class' into 'development'

Fix - Education Level in class.js

See merge request !46

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',

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();