diff --git a/src/libs/routes/city.js b/src/libs/routes/city.js
index bc7a41f300e89c3d20185bb11dfc964776075dce..3b03ef9c3899450503aff7eeb7ffcf087104034c 100644
--- a/src/libs/routes/city.js
+++ b/src/libs/routes/city.js
@@ -61,8 +61,9 @@ rqf.addField({
// Return all cities
cityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.sql.from('municipio')
- .field('municipio.nome')
- .field('municipio.pk_cod_ibge', 'pk_municipio_id');
+ .field('municipio.nome', 'name')
+ .field('municipio.pk_cod_ibge', 'id')
+ .field('municipio.fk_estado_id', 'state_id');
next();
}, query, response('city'));
diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index d5704282a91c2a8354f7958080ceece7506161a9..5a6f5c7957426ef69af5d7d7d4d9d70ad768c4fc 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -28,7 +28,7 @@ enrollmentApp.get('/year_range', (req, res, next) => {
enrollmentApp.get('/location', (req, res, next) => {
req.sql = squel.select()
- .field('pk_localizacao_id', 'location_id')
+ .field('pk_localizacao_id', 'id')
.field('descricao', 'description')
.from('localizacao');
next();
@@ -213,4 +213,4 @@ enrollmentApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
next();
}, query, response('enrollment'));
-module.exports = enrollmentApp;
\ No newline at end of file
+module.exports = enrollmentApp;
diff --git a/src/libs/routes/region.js b/src/libs/routes/region.js
index c7f5ec05ec02d810f1c50187c6c33dd4489af278..f152d899c05b99334725f52d17b71199b4a2f4dc 100644
--- a/src/libs/routes/region.js
+++ b/src/libs/routes/region.js
@@ -45,7 +45,9 @@ rqf.addField({
}, 'search');
regionApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
- req.sql.from('regiao');
+ req.sql.from('regiao')
+ .field('pk_regiao_id', 'id')
+ .field('nome', 'name');
next();
}, query, response('region'));
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 55792f19ceaf7c7ab20a8161a93e29c20737f4ba..6420db5d6b1fd64940e82eefa3e624b065ba3c90 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -71,10 +71,10 @@ schoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
});
}
req.sql.from('escola')
- .field('escola.cod_entidade')
+ .field('escola.cod_entidade', 'id')
.field('escola.ano_censo', 'year')
- .field('escola.fk_estado_id')
- .field('escola.fk_municipio_id');
+ .field('escola.fk_estado_id', 'state_id')
+ .field('escola.fk_municipio_id', 'city_id');
next();
}, query, response('school'));
diff --git a/src/libs/routes/state.js b/src/libs/routes/state.js
index 0a706a38e7d3db2f233d72a53fa32fe4e9396646..4da632605c9fd580937a5569450abfaad3b16e89 100644
--- a/src/libs/routes/state.js
+++ b/src/libs/routes/state.js
@@ -60,13 +60,13 @@ rqf.addField({
stateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.sql.from('estado')
- .field('pk_estado_id')
+ .field('pk_estado_id', 'id')
.group('pk_estado_id')
- .field('fk_regiao_id')
+ .field('fk_regiao_id', 'region_id')
.group('fk_regiao_id')
- .field('estado.nome')
+ .field('estado.nome', 'name')
.group('estado.nome')
- .field('estado.sigla')
+ .field('estado.sigla', 'abbreviation')
.group('estado.sigla');
next();
}, query, response('state'));
diff --git a/src/test/city.js b/src/test/city.js
index 904fb2f7b112a07d835f7881f948cbd086a9e9f1..1ea61a62f5d31be3c2789df5bc577a137ea50afa 100644
--- a/src/test/city.js
+++ b/src/test/city.js
@@ -34,8 +34,8 @@ describe('request cities', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('pk_municipio_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
done();
});
});
@@ -48,8 +48,8 @@ describe('request cities', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('pk_municipio_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
done();
});
});
@@ -62,8 +62,8 @@ describe('request cities', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('pk_municipio_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
done();
})
})
@@ -76,8 +76,8 @@ describe('request cities', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('pk_municipio_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
done();
});
});
diff --git a/src/test/enrollment.js b/src/test/enrollment.js
index 9d76718b49b59f74915ba5f9262ac399b220cb12..6d4c35b282f0215d3aad9107d971e937dabcf663 100644
--- a/src/test/enrollment.js
+++ b/src/test/enrollment.js
@@ -46,7 +46,7 @@ describe('request enrollments', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('location_id');
+ res.body.result[0].should.have.property('id');
res.body.result[0].should.have.property('description');
done();
});
diff --git a/src/test/region.js b/src/test/region.js
index 13e8316d99fb4c7d7f59cb83ba0e0c4f232089ba..daf45685c7a5298523afdf3e95446a715442429a 100644
--- a/src/test/region.js
+++ b/src/test/region.js
@@ -33,8 +33,8 @@ describe('request regions', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('pk_regiao_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
done();
});
});
@@ -48,8 +48,8 @@ describe('request regions', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result.should.have.length(1);
- res.body.result[0].should.have.property('pk_regiao_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
done();
});
});
@@ -63,8 +63,8 @@ describe('request regions', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result.should.have.length(1);
- res.body.result[0].should.have.property('pk_regiao_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
done();
});
});
diff --git a/src/test/school.js b/src/test/school.js
index 43171e30e86b888964985704a0ee2db123f6a124..7684e2737f9773551020ee976ade98f84d5fb2fb 100644
--- a/src/test/school.js
+++ b/src/test/school.js
@@ -33,7 +33,7 @@ describe('request schools', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('cod_entidade');
+ res.body.result[0].should.have.property('id');
res.body.result[0].should.have.property('year');
//res.body.result[0].should.have.property('nome_entidade');
done();
@@ -48,7 +48,7 @@ describe('request schools', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('cod_entidade');
+ res.body.result[0].should.have.property('id');
res.body.result[0].should.have.property('year');
//res.body.result[0].should.have.property('nome_entidade');
done();
@@ -63,7 +63,7 @@ describe('request schools', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('cod_entidade');
+ res.body.result[0].should.have.property('id');
res.body.result[0].should.have.property('year');
//res.body.result[0].should.have.property('nome_entidade');
done();
diff --git a/src/test/state.js b/src/test/state.js
index c1b08f92c240163cd0cb84910256f9f1e8bee4a2..df45900d8a1e897ffcf5080e663ad870dcc589e3 100644
--- a/src/test/state.js
+++ b/src/test/state.js
@@ -34,9 +34,9 @@ describe('request states', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('pk_estado_id');
- res.body.result[0].should.have.property('fk_regiao_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('region_id');
+ res.body.result[0].should.have.property('name');
done();
});
});
@@ -50,9 +50,9 @@ describe('request states', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result.should.have.length(1);
- res.body.result[0].should.have.property('pk_estado_id');
- res.body.result[0].should.have.property('fk_regiao_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('region_id');
+ res.body.result[0].should.have.property('name');
done();
});
});
@@ -65,9 +65,9 @@ describe('request states', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('pk_estado_id');
- res.body.result[0].should.have.property('fk_regiao_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('region_id');
+ res.body.result[0].should.have.property('name');
done();
});
});
@@ -81,9 +81,9 @@ describe('request states', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result.should.have.length(1);
- res.body.result[0].should.have.property('pk_estado_id');
- res.body.result[0].should.have.property('fk_regiao_id');
- res.body.result[0].should.have.property('nome');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('region_id');
+ res.body.result[0].should.have.property('name');
done();
});
});