Merge branch 'development' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into development

src/libs/routes/rateSchool.js

@@ -26,10 +26,10 @@ const passport = require('passport');
 
 const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
 
-rateSchoolApp.use(cache('15 day'));
-
 let rqf = new ReqQueryFields();
 
+rateSchoolApp.use(cache('15 day'));
+
 // Complete range of the enrollments dataset.
 // Returns a tuple of start and ending years of the complete enrollments dataset.
 rateSchoolApp.get('/year_range', (req, res, next) => {
@@ -151,6 +151,28 @@ rqf.addField({
         foreign: 'estado_id',
         foreignTable: 'pnad'
     }
+}).addValue({
+    name: 'min_year',
+    table: 'pnad',
+    tableField: 'ano_censo',
+    resultField: 'year',
+    where: {
+        relation: '>=',
+        type: 'integer',
+        table: 'pnad',
+        field: 'ano_censo'
+    }
+}).addValue({
+    name: 'max_year',
+    table: 'pnad',
+    tableField: 'ano_censo',
+    resultField: 'year',
+    where: {
+        relation: '<=',
+        type: 'integer',
+        table: 'pnad',
+        field: 'ano_censo'
+    }
 }).addValue({
     name: 'ethnic_group',
     table: 'pnad',
@@ -282,7 +304,7 @@ rateSchoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     req.result = school_attendance_rate;
 
     next();
-}, id2str.multitransform(false), response('rateSchool'));
+}, id2str.multitransform(false), response('rate_school'));
 
 rateSchoolApp.get('/download', passport.authenticate('bearer', { session: false }), rqf.parse(), rqf.build(), download('pnad', 'mapping_pnad'));
 

src/test/rateSchool.js

@@ -23,7 +23,7 @@ const libs = `${process.cwd()}/libs`;
 const server = require(`${libs}/app`);
 
 chai.use(chaiHttp);
-describe('request idhme', () => {
+describe('request rate_school', () => {
     it('should list default query rate school', (done) => {
         chai.request(server)
             .get('/api/v1/rate_school')
@@ -182,4 +182,21 @@ describe('request idhme', () => {
                 done();
             });
     });
+
+    it('should list rate schools with dimension fifth household income', (done) => {
+        chai.request(server)
+            .get('/api/v1/rate_school?filter=region:[1,2],min_year:2015')
+            .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('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');
+                done();
+            });
+    });
 });