diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js index 6a26bc68b18ed1a8e167f224217c66bc74f3b253..c91ca308be6935c8d768dea7550755579c5f7e41 100644 --- a/src/libs/routes/school.js +++ b/src/libs/routes/school.js @@ -10,6 +10,8 @@ const query = require(`${libs}/middlewares/query`); const response = require(`${libs}/middlewares/response`); +const id2str = require(`${libs}/middlewares/id2str`); + const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`); let rqf = new ReqQueryFields(); @@ -416,7 +418,7 @@ rqfCount.addField({ name: 'location', table: 'escola', tableField: 'cod_localizacao', - resultField: 'cod_localizacao', + resultField: 'location_id', where: { relation: '=', type: 'integer', @@ -603,16 +605,16 @@ rqfCount.addField({ field: 'sanitario_dentro_predio' } }).addValue({ - name: 'wastepipe', - table: 'escola', - tableField: 'esgoto_sanitario', - resultField: 'wastepipe_name', - where: { - relation: '=', - type: 'boolean', - field: 'esgoto_sanitario' - } - }).addValue({ + name: 'wastepipe', + table: 'escola', + tableField: 'esgoto_sanitario', + resultField: 'wastepipe_name', + where: { + relation: '=', + type: 'boolean', + field: 'esgoto_sanitario' + } +}).addValue({ name: 'water', table: 'escola', tableField: 'fornecimento_agua', @@ -723,6 +725,6 @@ schoolApp.get('/count', rqfCount.parse(), rqfCount.build(), (req, res, next) => .order('escola.ano_censo') .where('escola.situacao_de_funcionamento = 1 AND escola.ensino_regular = 1'); next(); -}, query, response('school')); +}, query, id2str.transform(true), response('school')); module.exports = schoolApp;