Skip to content
Snippets Groups Projects

Merge new updates into master

Merged Pietro Cavassin requested to merge new_updates into master
1 file
+ 42
1
Compare changes
  • Side-by-side
  • Inline
+ 42
1
@@ -82,7 +82,25 @@ rqf.addField({
@@ -82,7 +82,25 @@ rqf.addField({
type: 'string',
type: 'string',
field: 'nome'
field: 'nome'
}
}
}, 'search');;
}, 'search').addValue({
 
name: 'mesoregion',
 
table: 'municipio',
 
tableField: 'mesorregiao_id',
 
where: {
 
relation: '=',
 
type: 'integer',
 
field: 'mesorregiao_id'
 
}
 
}).addValue({
 
name: 'microregion',
 
table: 'municipio',
 
tableField: 'microrregiao_id',
 
where: {
 
relation: '=',
 
type: 'integer',
 
field: 'microrregiao_id'
 
}
 
});
// Return all cities
// Return all cities
cityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
cityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
@@ -97,4 +115,27 @@ cityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
@@ -97,4 +115,27 @@ cityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
next();
next();
}, query, response('city'));
}, query, response('city'));
 
cityApp.get('/microregion', rqf.parse(), rqf.build(), (req, res, next) => {
 
req.sql.from('municipio')
 
.field('municipio.estado_id', 'state_id')
 
.field('municipio.microrregiao_id', 'microregion_id')
 
.field('municipio.nome_microrregiao', 'microregion_name')
 
.group('municipio.estado_id')
 
.group('municipio.microrregiao_id')
 
.group('municipio.nome_microrregiao')
 
next();
 
}, query, response('city/microregion'));
 
 
cityApp.get('/mesoregion', rqf.parse(), rqf.build(), (req, res, next) => {
 
req.sql.from('municipio')
 
.field('municipio.estado_id', 'state_id')
 
.field('municipio.mesorregiao_id', 'mesoregion_id')
 
.field('municipio.nome_mesorregiao', 'mesoregion_name')
 
.group('municipio.nome_mesorregiao')
 
.group('municipio.mesorregiao_id')
 
.group('municipio.estado_id')
 
next();
 
}, query, response('city/mesoregion'));
 
 
module.exports = cityApp;
module.exports = cityApp;
Loading