diff --git a/src/libs/convert/admDependency.js b/src/libs/convert/admDependency.js index 648fe41621adb5c436b346fd84d9e2c691ff25a9..16017f06634d2d9b69ad1e605c4922c2b29ff243 100644 --- a/src/libs/convert/admDependency.js +++ b/src/libs/convert/admDependency.js @@ -8,12 +8,6 @@ module.exports = function admDependency(id) { return 'Municipal'; case 4: return 'Privada'; - case 5: - return 'Privada conveniada'; - case 6: - return 'Privada não conveniada sem fins lucrativos'; - case 7: - return 'Privada não conveniada com fins lucrativos'; default: return 'Não classificada'; } diff --git a/src/libs/convert/ethnicGroupPnad.js b/src/libs/convert/ethnicGroupPnad.js index 67d4bd39b6598f4670902f140b5460b7c5a564f7..93428cd4440f4559dda7ff10c429c135e263960a 100644 --- a/src/libs/convert/ethnicGroupPnad.js +++ b/src/libs/convert/ethnicGroupPnad.js @@ -1,15 +1,11 @@ module.exports = function ethnicGroupPnad(id) { switch (id) { - case 2: - return 'Branca'; - case 4: - return 'Preta'; - case 6: - return 'Amarela'; - case 8: - return 'Parda'; case 0: return 'IndÃgena'; + case 1: + return 'Branca e amarela'; + case 2: + return 'Preta e parda'; default: return 'Sem declaração'; } diff --git a/src/libs/routes/rateSchool.js b/src/libs/routes/rateSchool.js index 4aa23d36042b35d86f801028a643d0723a635adc..12c0aeed25cf46b3703e9c9e2df1c7e7047085e4 100644 --- a/src/libs/routes/rateSchool.js +++ b/src/libs/routes/rateSchool.js @@ -54,11 +54,9 @@ rateSchoolApp.get('/source', (req, res, next) => { rateSchoolApp.get('/ethnic_group_pnad', (req, res, next) => { req.result = [ - {id: 2, name: 'Branca'}, - {id: 4, name: 'Preta'}, - {id: 6, name: 'Amarela'}, - {id: 8, name: 'Parda'}, {id: 0, name: 'IndÃgena'}, + {id: 1, name: 'Branca e amarela'}, + {id: 2, name: 'Preta e parda'}, {id: 9, name: 'Sem declaração'} ]; next(); diff --git a/src/test/id2str.js b/src/test/id2str.js index 15f15c7fe9a1ed2ee9312005147d147910b9f8ce..0a52858b5673c51ad8172a57be2257b17b3e1eb6 100644 --- a/src/test/id2str.js +++ b/src/test/id2str.js @@ -53,6 +53,16 @@ describe('id2str middleware', () => { done(); }); + it('should transform a class adm dependency id', (done) => { + expect(id2str.admDependency(6)).to.deep.equal('Não classificada'); + done(); + }); + + it('should transform a class adm dependency priv id', (done) => { + expect(id2str.admDependencyPriv(7)).to.deep.equal('Não classificada'); + done(); + }); + it('should transform a result', (done) => { let req = { result: [{gender_id: 2, period_id: 3, school_year_id: 11}] diff --git a/src/test/rateSchool.js b/src/test/rateSchool.js index 336516140287e4592619378f1fcef09a69e4e24b..36ee35c437a9096cddbad47bc5adb91402825ebc 100644 --- a/src/test/rateSchool.js +++ b/src/test/rateSchool.js @@ -105,6 +105,20 @@ describe('request rate_school', () => { }); }); + it('should list the age range', (done) => { + chai.request(server) + .get('/api/v1/rate_school?dims=age_range') + .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('age_range_id'); + res.body.result[0].should.have.property('age_range_name'); + done(); + }); + }); + it('should list the gender', (done) => { chai.request(server) .get('/api/v1/rate_school/gender') @@ -194,4 +208,32 @@ describe('request rate_school', () => { done(); }); }); + + it('should list the dimensions of ethnic groups', (done) => { + chai.request(server) + .get('/api/v1/rate_school?dims=ethnic_group_pnad') + .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('ethnic_group_pnad_id'); + res.body.result[0].should.have.property('ethnic_group_pnad_name'); + done(); + }); + }); + + it('should list the dimensions of gender', (done) => { + chai.request(server) + .get('/api/v1/rate_school?dims=gender') + .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('gender_pnad_id'); + res.body.result[0].should.have.property('gender_pnad_name'); + done(); + }); + }); });