diff --git a/src/libs/routes/region.js b/src/libs/routes/region.js index 36b1f04977c7f9b827d7f571de604a8512743314..6461b3a4facf755f92ad9dec823ef9759fc53511 100644 --- a/src/libs/routes/region.js +++ b/src/libs/routes/region.js @@ -1,46 +1,20 @@ const express = require('express'); - -const xml = require('js2xmlparser'); - const regionApp = express(); - const libs = `${process.cwd()}/libs`; - const log = require(`${libs}/log`)(module); - -const dbQuery = require(`${libs}/db/query_exec`); - -function response(req, res) { - if (req.query.format === 'csv') { - res.csv(req.result); - } else if (req.query.format === 'xml') { - res.send(xml('result', JSON.stringify({ state: req.result }))); - } else { - res.json({ result: req.result }); - } -} - -regionApp.get('/', (req, res) => { - const regionSql = 'SELECT * FROM regioes'; - dbQuery(regionSql).then((result) => { - req.result = result; - return response(req, res); - }, (error) => { - log.error(`[${req.originalUrl}] SQL query error: ${error}`); - next('Internal error, request could not be satisfied at this moment. Please, try again later'); - }); -}); - -regionApp.get('/:id', (req, res) => { - const regionSql = 'SELECT * FROM regioes WHERE pk_regiao_id = ?'; - const regionId = parseInt(req.params.id, 10); - dbQuery(regionSql, [regionId]).then((result) => { - req.result = result; - return response(req, res); - }, (error) => { - log.error(`[${req.originalUrl}] SQL query error: ${error}`); - next('Internal error, request could not be satisfied at this moment. Please, try again later'); - }); -}); +const squel = require('squel'); +const query = require(`${libs}/middlewares/query`); +const response = require(`${libs}/middlewares/response`); + +regionApp.get('/', (req, res, next) => { + req.query = squel.select().from('regioes').toParam(); + next(); +}, query, response); + +regionApp.get('/:id', (req, res, next) => { + req.query = squel.select().from('regioes').where('pk_regiao_id = ?', + parseInt(req.params.id, 10)).toParam(); + next(); +}, query, response); module.exports = regionApp; diff --git a/src/libs/routes/regions.js b/src/libs/routes/regions.js deleted file mode 100644 index cfbbcd946572a8a30ebf00536ce9cbf544226f7f..0000000000000000000000000000000000000000 --- a/src/libs/routes/regions.js +++ /dev/null @@ -1,38 +0,0 @@ -var express = require('express') -var xml = require('js2xmlparser') -var router = express.Router() -var squel = require('squel') - -var libs = process.cwd() + '/libs/' - -var log = require(libs + 'log')(module) -var config = require(libs + 'config') - -var conn = require(libs + 'db/monet') - -var query = require(libs + 'middlewares/query') - -function response(req, res) { - if (req.query.format === 'csv') { - res.csv(req.result.data) - } else if (req.query.format === 'xml') { - res.send(xml("result", JSON.stringify({state: req.result.data}))) - } - else { - res.json({ - result: req.result.data - }) - } -} - -router.get('/', function(req, res, next) { - req.query = squel.select().from('regioes').toParam() - next() -}, query, response) - -router.get('/:id', function(req, res, next) { - req.query = squel.select().from('regioes').where('pk_regiao_id=?', parseInt(req.params.id, 10)).toParam() - next() -}, query, response) - -module.exports = router