diff --git a/src/libs/routes/city.js b/src/libs/routes/city.js index 1686c850aeea190dd8af43acf46acc9d0ceb8bb8..fc697a9f5d146c48c5e87c49ec54572566b22f82 100644 --- a/src/libs/routes/city.js +++ b/src/libs/routes/city.js @@ -69,6 +69,22 @@ rqf.addField({ foreign: 'estado_id', foreignTable: 'municipio' } +}).addValue({ + name: 'state_not', + table: 'estado', + tableField: ['nome', 'id'], + resultField: ['state_name', 'state_id'], + where: { + relation: '<>', + type: 'integer', + field: 'estado_id', + table: 'municipio' + }, + join: { + primary: 'id', + foreign: 'estado_id', + foreignTable: 'municipio' + } }).addField({ name: 'search', field: false, @@ -100,7 +116,23 @@ rqf.addField({ type: 'integer', field: 'microrregiao_id' } -}); +}).addValueToField({ + name: 'region', + table: 'estado', + tableField: 'regiao_id', + resultField: 'region_id', + where: { + relation: '=', + type: 'integer', + field: 'regiao_id', + table: 'estado' + }, + join: { + primary: 'id', + foreign: 'estado_id', + foreignTable: 'municipio' + } +}, 'filter'); // Return all cities cityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { diff --git a/src/libs/routes/region.js b/src/libs/routes/region.js index b1076e6484836b8a4911b8d0ada3631f1304e3c0..5df65e726e1895f256f276ce22a32b1c7cc41712 100644 --- a/src/libs/routes/region.js +++ b/src/libs/routes/region.js @@ -36,6 +36,16 @@ rqf.addField({ field: 'id', table: '@' } +}).addValue({ + name: 'id_not', + table: '@', + tableField: 'id', + where: { + relation: '<>', + type: 'integer', + field: 'id', + table: '@' + } }).addField({ name: 'search', field: false, diff --git a/src/libs/routes/state.js b/src/libs/routes/state.js index 453ca6ebbe30aa330fc1e8949cc8db4ae1bf7bb7..c9830b20a52b2997ab96f020c893a00e10d4c3df 100644 --- a/src/libs/routes/state.js +++ b/src/libs/routes/state.js @@ -53,6 +53,15 @@ rqf.addField({ type: 'integer', field: 'id' } +}).addValue({ + name: 'id_not', + table: 'estado', + tableField: 'id', + where: { + relation: '<>', + type: 'integer', + field: 'id' + } }).addValue({ name: 'region', table: 'regiao',