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

src/libs/middlewares/reqQueryFields.js

@@ -198,9 +198,9 @@ class ReqQueryFields {
     build() {
         // "Constrói" o SQL
         return (req, res, next) => {
-            // Foreach no campos
             let hasJoined = {};
             let thisTable = req.sql.tableFrom;
+            // Foreach no campos
             Object.keys(this.fields).forEach((key) => {
                 // Campo
                 let field = this.fields[key];

src/libs/routes/api.js

@@ -59,7 +59,7 @@ api.use('/state', state);
 api.use('/region', region);
 api.use('/city', city);
 api.use('/school', school);
-api.use('/spatial', spatial);
+// api.use('/spatial', spatial);
 api.use('/classroom', classroom);
 api.use('/teacher', teacher);
 api.use('/idhmr', idhmr);

src/libs/routes/class.js

@@ -85,11 +85,19 @@ classApp.get('/adm_dependency_detailed', (req, res, next) => {
 
 // Returns all periods avaible
 classApp.get('/period', (req, res, next) => {
-    req.sql.from('turma_turno')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i=1; i <= 3; ++i) {
+        req.result.push({
+            id: i,
+            name: id2str.period(i)
+        });
+    }
+    req.result.push({
+        id: 99,
+        name: id2str.period(99)
+    });
     next();
-}, query, response('period'));
+}, response('period'));
 
 // Returns integral-time avaible
 classApp.get('/integral_time', (req, res, next) => {
@@ -103,11 +111,19 @@ classApp.get('/integral_time', (req, res, next) => {
 
 // Returns all educational levels avaible
 classApp.get('/education_level_mod', (req, res, next) => {
-    req.sql.from('etapas_mod_ensino_segmento')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i = 1; i <=11; ++i) {
+        req.result.push({
+            id: i,
+            name: id2str.educationLevelMod(i)
+        });
+    }
+    req.result.push({
+        id: 99,
+        name: id2str.educationLevelMod(99)
+    });
     next();
-}, query, response('education_level_mod'));
+}, response('education_level_mod'));
 
 classApp.get('/education_level_short', (req, res, next) => {
     req.result = [

src/libs/routes/enrollment.js

@@ -69,27 +69,59 @@ enrollmentApp.get('/rural_location', (req, res, next) => {
 
 // Returns all school years available
 enrollmentApp.get('/school_year', (req, res, next) => {
-    req.sql.from('serie_ano')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i = 11; i <= 71; ++i) {
+        let obj = {
+            id: i,
+            name: id2str.schoolYear(i)
+        };
+
+        if(obj.name !== id2str.schoolYear(99)) {
+            req.result.push(obj);
+        }
+    }
+    req.result.push({
+        id: 99,
+        name: id2str.schoolYear(99)
+    });
     next();
-}, query, response('school_year'));
+}, response('school_year'));
 
 // Returns all school years available
 enrollmentApp.get('/education_level', (req, res, next) => {
-    req.sql.from('etapa_ensino')
-    .field('id')
-    .field('desc_etapa', 'name');
+    req.result = [];
+    for(let i = 1; i <= 74; ++i) {
+        let obj = {
+            id: i,
+            name: id2str.educationLevel(i)
+        };
+
+        if(obj.name !== id2str.educationLevel(99)) {
+            req.result.push(obj);
+        }
+    }
+    req.result.push({
+        id: 99,
+        name: id2str.educationLevel(99)
+    });
     next();
-}, query, response('education_level'));
+}, response('education_level'));
 
 // Returns all school years available
 enrollmentApp.get('/education_level_mod', (req, res, next) => {
-    req.sql.from('etapas_mod_ensino_segmento')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i = 1; i <= 11; ++i) {
+        req.result.push({
+            id: i,
+            name: id2str.educationLevelMod(i)
+        });
+    }
+    req.result.push({
+        id: 99,
+        name: id2str.educationLevelMod(99)
+    });
     next();
-}, query, response('education_level_mod'));
+}, response('education_level_mod'));
 
 enrollmentApp.get('/education_level_short', (req, res, next) => {
     req.result = [
@@ -132,18 +164,30 @@ enrollmentApp.get('/gender', (req, res, next) => {
 
 // Return ethnic group
 enrollmentApp.get('/ethnic_group', (req, res, next) => {
-    req.sql.from('cor_raca')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i = 0; i <=5; ++i) {
+        req.result.push({
+            id: i,
+            name: id2str.ethnicGroup(i)
+        });
+    }
     next();
-}, query, response('ethnic_group'));
+}, response('ethnic_group'));
 
 enrollmentApp.get('/period', (req, res, next) => {
-    req.sql.from('turma_turno')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i = 1; i <= 3; ++i) {
+        req.result.push({
+            id: i,
+            name: id2str.period(i)
+        });
+    }
+    req.result.push({
+        id: 99,
+        name: id2str.period(99)
+    });
     next();
-}, query, response('period'));
+}, response('period'));
 
 // Returns integral-time avaible
 enrollmentApp.get('/integral_time', (req, res, next) => {

src/libs/routes/idhm.js

@@ -65,6 +65,13 @@ idhmApp.get('/years', (req, res, next) => {
     next();
 }, response('years'));
 
+idhmApp.get('/source', (req, res, next) => {
+    req.sql.from('fonte')
+    .field('fonte', 'source')
+    .where('tabela = \'adh_idh\'');
+    next();
+}, query, response('source'));
+
 idhmApp.get('/IDHM_level', (req, res, next) => {
     req.result = [
         {id: null, name: 'Não classificada'},

src/libs/routes/idhme.js

@@ -63,6 +63,13 @@ idhmeApp.get('/years', (req, res, next) => {
     next();
 }, response('years'));
 
+idhmeApp.get('/source', (req, res, next) => {
+    req.sql.from('fonte')
+    .field('fonte', 'source')
+    .where('tabela = \'adh_idh\'');
+    next();
+}, query, response('source'));
+
 rqf.addField({
     name: 'filter',
     field: false,

src/libs/routes/idhml.js

@@ -63,6 +63,13 @@ idhmlApp.get('/years', (req, res, next) => {
     next();
 }, response('years'));
 
+idhmlApp.get('/source', (req, res, next) => {
+    req.sql.from('fonte')
+    .field('fonte', 'source')
+    .where('tabela = \'adh_idh\'');
+    next();
+}, query, response('source'));
+
 rqf.addField({
     name: 'filter',
     field: false,

src/libs/routes/idhmr.js

@@ -65,6 +65,13 @@ idhmrApp.get('/years', (req, res, next) => {
     next();
 }, response('years'));
 
+idhmrApp.get('/source', (req, res, next) => {
+    req.sql.from('fonte')
+    .field('fonte', 'source')
+    .where('tabela = \'adh_idh\'');
+    next();
+}, query, response('source'));
+
 rqf.addField({
     name: 'filter',
     field: false,

src/libs/routes/pibpercapita.js

@@ -37,6 +37,13 @@ pibpercapitaApp.get('/years', (req, res, next) => {
     next();
 }, query, response('years'));
 
+pibpercapitaApp.get('/source', (req, res, next) => {
+    req.sql.from('fonte')
+    .field('fonte', 'source')
+    .where('tabela = \'ibge_pib\'');
+    next();
+}, query, response('source'));
+
 pibpercapitaApp.get('/income_level', (req, res, next) => {
     req.result = [
         {id: 1, name: "1º quintil – 20% menores"},

src/libs/routes/school.js

@@ -467,7 +467,7 @@ schoolApp.get('/count', cache('15 day'), rqfCount.parse(), rqfCount.build(), (re
     next();
 }, query, id2str.transform(), response('school'));
 
-schoolApp.get('/count/download', rqf.parse(), rqf.build(), (req, res, next) => {
+schoolApp.get('/count/download', rqfCount.parse(), rqfCount.build(), (req, res, next) => {
     let username = req.query.user;
     let email = req.query.email;
 

src/libs/routes/teacher.js

@@ -61,11 +61,20 @@ teacherApp.get('/adm_dependency', (req, res, next) => {
 }, query, response('adm_dependency'));
 
 teacherApp.get('/education_level_mod', (req, res, next) => {
-    req.sql.from('etapas_mod_ensino_segmento')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i = 1; i <= 11; ++i) {
+        req.result.push({
+            id: i,
+            name: id2str.educationLevelMod(i)
+        });
+    }
+
+    req.result.push({
+        id: 99,
+        name: id2str.educationLevelMod(99)
+    });
     next();
-}, query, response('education_level_mod'));
+}, response('education_level_mod'));
 
 teacherApp.get('/education_level_short', (req, res, next) => {
     req.result = [
@@ -122,11 +131,15 @@ teacherApp.get('/gender', (req, res, next) => {
 }, response('gender'));
 
 teacherApp.get('/ethnic_group', (req, res, next) => {
-    req.sql.from('cor_raca')
-    .field('id')
-    .field('nome', 'name');
+    req.result = [];
+    for(let i = 0; i <=5; ++i) {
+        req.result.push({
+            id: i,
+            name: id2str.ethnicGroup(i)
+        });
+    }
     next();
-}, query, response('ethnic_group'));
+}, response('ethnic_group'));
 
 rqf.addField({
     name: 'filter',
@@ -323,16 +336,54 @@ rqf.addField({
     }
 });
 
-teacherApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
-   req.sql.field('COUNT(DISTINCT docente.id)', 'total')
-   .field("'Brasil'", 'name')
-   .field('docente.ano_censo', 'year')
-   .from('docente')
-   .join('turma', null, 'docente.turma_id=turma.id AND docente.ano_censo=turma.ano_censo')
-   .group('docente.ano_censo')
-   .order('docente.ano_censo')
-   .where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)');
-   next();
-}, query, id2str.transform(), response('teacher'));
+teacherApp.get('/', rqf.parse(), (req, res, next) => {
+    req.sql.field('COUNT(DISTINCT docente.id)', 'total')
+    .field("'Brasil'", 'name')
+    .field('docente.ano_censo', 'year')
+    .from('docente')
+    .join('turma', null, 'docente.turma_id=turma.id AND docente.ano_censo=turma.ano_censo')
+    .group('docente.ano_censo')
+    .order('docente.ano_censo')
+    .where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)');
+
+    if("education_level_mod" in req.dims) {
+        delete req.dims.education_level_mod;
+        req.hadEducationLevelMod = true;
+        req.sql.field('docente.etapas_mod_ensino_segmento_id', 'education_level_mod_id')
+        .where('docente.etapas_mod_ensino_segmento_id < 11')
+        .group('docente.etapas_mod_ensino_segmento_id');
+    }
+
+    next();
+}, rqf.build(), query, (req, res, next) => {
+    req.oldResult = req.result;
+    if(req.hadEducationLevelMod) {
+
+        req.sql = squel.select()
+        .field('COUNT(DISTINCT docente.id)', 'total')
+        .field("'Brasil'", 'name')
+        .field('docente.ano_censo', 'year')
+        .from('docente')
+        .join('turma', null, 'docente.turma_id=turma.id AND docente.ano_censo=turma.ano_censo')
+        .group('docente.ano_censo')
+        .order('docente.ano_censo')
+        .where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)')
+        .where('docente.profissionalizante = 1');
+
+        rqf.build()(req, res, () => {});
+        query(req, res, next);
+    } else {
+        next();
+    }
+}, /*rqf.build(), query,*/ (req, res, next) => {
+    if(req.hadEducationLevelMod) {
+        req.result.forEach((result) => {
+            result.education_level_mod_id = 11;
+            req.oldResult.push(result);
+        });
+    }
+    req.result = req.oldResult;
+    next();
+}, id2str.transform(), response('teacher'));
 
 module.exports = teacherApp;

src/test/query.js

@@ -75,16 +75,13 @@ describe('Query middleware', () => {
         });
     });
 
-    it('should return 404 with an empty query result', (done) => {
+    it('should not return 404 with an empty query result', (done) => {
         let req = {
             sql: squel.select().field('*').from('regiao').where('id>6')
         };
         let res = {};
         query(req, {},  (error)=>{
-            error.should.have.property('status');
-            error.status.should.be.equal(404);
-            error.should.have.property('message');
-            error.message.should.be.equal('No results found in database');
+            req.should.have.property('result');
             done();
         });
     });

src/test/teacher.js

@@ -294,7 +294,7 @@ describe('request teachers', () => {
             });
     });
 
-    it('should list enrollment with dimension education_level_short', (done) => {
+    it('should list teacher with dimension education_level_short', (done) => {
         chai.request(server)
             .get('/api/v1/teacher?dims=education_level_short')
             .end((err, res) => {