From 05947dffdaf4749edbd48dec53d2d539dacddf4a Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Wed, 6 Jul 2016 11:18:05 -0300
Subject: [PATCH] Add csv-express and basic csv respnse to /matriculas
Related: #3
---
libs/app.js | 1 +
libs/routes/api.js | 25 +++++++++++++++----------
package.json | 1 +
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/libs/app.js b/libs/app.js
index 146cc681..205448c6 100644
--- a/libs/app.js
+++ b/libs/app.js
@@ -2,6 +2,7 @@ var express = require('express')
var path = require('path')
var cookieParser = require('cookie-parser')
var bodyParser = require('body-parser')
+var csv = require('csv-express')
var methodOverride = require('method-override')
var libs = process.cwd() + '/libs/'
diff --git a/libs/routes/api.js b/libs/routes/api.js
index 0bde814c..faafaf21 100644
--- a/libs/routes/api.js
+++ b/libs/routes/api.js
@@ -15,9 +15,9 @@ router.get('/', function (req, res) {
})
router.get('/data', function(req, res) {
- console.log(req.query)
- console.log(req.query.met)
- console.log(req.query.dim)
+ log.debug(req.query)
+ log.debug(req.query.met)
+ log.debug(req.query.dim)
conn.query(
'SELECT * FROM turmas'
).then(function(result) {
@@ -27,8 +27,8 @@ router.get('/data', function(req, res) {
})
})
-router.get('/matriculas', function(req, res) {
- console.log(req.query);
+router.get('/matriculas/:format?', function(req, res) {
+ log.debug(req.query);
tbl_name = "matriculas";
switch(req.query.agregar)
@@ -41,17 +41,22 @@ router.get('/matriculas', function(req, res) {
break;
}
- console.log("Querying table '" + tbl_name + "'");
+ log.info("Querying table '" + tbl_name + "'");
/* FIXME: Replace parameter substitution
- Might not be needed since the parameter tbl_name is not supplied by the user */
conn.query(
'SELECT * FROM ' + tbl_name, true
).then(function(result) {
- console.log(result);
- res.json({
- result: result.data
- })
+ log.debug(result);
+ if (req.params.format) {
+ res.csv(result.data)
+ }
+ else {
+ res.json({
+ result: result.data
+ })
+ }
});
})
diff --git a/package.json b/package.json
index 491b4b77..f5ff893b 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"dependencies": {
"body-parser": "^1.13.1",
"cookie-parser": "^1.3.5",
+ "csv-express": "^1.1.0",
"debug": "~2.0.x",
"express": "^4.13.0",
"faker": "^2.1.5",
--
GitLab