Merge branch 'fix_rate_school' into development

src/libs/middlewares/addMissing.js

@@ -4,6 +4,7 @@ module.exports = function addMissing(rqf){
         // FIXME: No momento, só funciona para duas dimensões (padrão para o LDE)
         if(dims.length != 2) return next();
         if(req.filter.min_year != req.filter.max_year) return next();
+        if(req.result.length === 0) return next();
     
         let result = req.result;
         let dimsValues = {};

src/test/rateSchool.js

@@ -32,7 +32,7 @@ describe('request rate_school', () => {
                 res.should.be.json;
                 res.body.should.have.property('result');
                 res.body.result.should.be.a('array');
-                res.body.result[0].should.have.property('school_attendance_rate');
+                res.body.result[0].should.have.property('total');
                 done();
             });
     });
@@ -79,7 +79,7 @@ describe('request rate_school', () => {
 
     it('should list the ethnic groups', (done) => {
         chai.request(server)
-            .get('/api/v1/rate_school/ethnic_group')
+            .get('/api/v1/rate_school/ethnic_group_pnad')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -141,8 +141,6 @@ describe('request rate_school', () => {
                 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();
             });
     });
@@ -155,12 +153,11 @@ describe('request rate_school', () => {
                 res.should.be.json;
                 res.body.should.have.property('result');
                 res.body.result.should.be.a('array');
-                res.body.result[0].should.have.property('school_attendance_rate');
                 res.body.result[0].should.have.property('extremes_household_income_id');
                 res.body.result[0].should.have.property('total');
                 res.body.result[0].should.have.property('year');
                 res.body.result[0].should.have.property('partial');
-                res.body.result[0].should.have.property('percentage');
+                res.body.result[0].should.have.property('denominator');
                 done();
             });
     });
@@ -173,12 +170,11 @@ describe('request rate_school', () => {
                 res.should.be.json;
                 res.body.should.have.property('result');
                 res.body.result.should.be.a('array');
-                res.body.result[0].should.have.property('school_attendance_rate');
                 res.body.result[0].should.have.property('fifth_household_income_id');
                 res.body.result[0].should.have.property('total');
                 res.body.result[0].should.have.property('year');
                 res.body.result[0].should.have.property('partial');
-                res.body.result[0].should.have.property('percentage');
+                res.body.result[0].should.have.property('denominator');
                 done();
             });
     });
@@ -191,11 +187,10 @@ describe('request rate_school', () => {
                 res.should.be.json;
                 res.body.should.have.property('result');
                 res.body.result.should.be.a('array');
-                res.body.result[0].should.have.property('school_attendance_rate');
                 res.body.result[0].should.have.property('total');
                 res.body.result[0].should.have.property('year');
                 res.body.result[0].should.have.property('partial');
-                res.body.result[0].should.have.property('percentage');
+                res.body.result[0].should.have.property('denominator');
                 done();
             });
     });