From 63bdc8ec8c7f16a18064cdde5d7be46b250afd27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Tozatti=20Risso?= <jvtr12@inf.ufpr.br>
Date: Fri, 2 Sep 2016 13:20:00 -0300
Subject: [PATCH] Merge regions.js with region.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: João Victor Tozatti Risso <jvtr12@inf.ufpr.br>
---
 src/libs/routes/region.js  | 54 ++++++++++----------------------------
 src/libs/routes/regions.js | 38 ---------------------------
 2 files changed, 14 insertions(+), 78 deletions(-)
 delete mode 100644 src/libs/routes/regions.js

diff --git a/src/libs/routes/region.js b/src/libs/routes/region.js
index 36b1f049..6461b3a4 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 cfbbcd94..00000000
--- 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
-- 
GitLab