From 0b0f1646ee55b6a0f43c6aeffaf0c6f39cfc84e6 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:55:10 -0300
Subject: [PATCH] Fix ESLint errors in enrollment.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/enrollment.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index 131ab7ae..91fbaeae 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -1,7 +1,5 @@
 const express = require('express');
 
-const xml = require('js2xmlparser');
-
 const enrollmentApp = express();
 
 const libs = `${process.cwd()}/libs`;
@@ -10,15 +8,8 @@ const log = require(`${libs}/log`)(module);
 
 const dbQuery = require('../db/query_exec');
 
-function response(req, res) {
-    if (req.query.format === 'csv') {
-        return res.csv(req.result);
-    } else if (req.query.format === 'xml') {
-        return res.send(xml('result', JSON.stringify({ state: req.result })));
-    } else {
-        return res.json({ result: req.result });
-    }
-}
+const response = require('../middlewares/response');
+
 /**
  * Complete range of the enrollments dataset
  *
@@ -35,11 +26,12 @@ enrollmentApp.get('/year_range', (req, res, next) => {
         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');
+        next('Internal error, request could not be satisfied at this moment. Please, '
+            + 'try again later');
     });
 });
 
-enrollmentApp.get('/education_level', (req, res) => {
+enrollmentApp.get('/education_level', (req, res, next) => {
     const edLevelSql = 'SELECT pk_etapa_ensino_id AS id, desc_etapa AS '
         + 'education_level FROM etapa_ensino';
 
@@ -48,18 +40,20 @@ enrollmentApp.get('/education_level', (req, res) => {
         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');
+        next('Internal error, request could not be satisfied at this moment. Please, '
+            + 'try again later');
     });
 });
 
-enrollmentApp.get('/data', (req, res) => {
+enrollmentApp.get('/data', (req, res, next) => {
     const schoolClassSql = 'SELECT * FROM turmas';
     dbQuery(schoolClassSql).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');
+        next('Internal error, request could not be satisfied at this moment. Please, '
+            + 'try again later');
     });
 });
 
@@ -288,7 +282,8 @@ enrollmentApp.get('/enrollments', (req, res, next) => {
         // '/enrollments' route, since when no +aggregate+ parameter is given,
         // it defaults to use the query for the whole country.
         log.error('BUG -- No SQL query was found to be executed!');
-        next('Internal error, request could not be satisfied at this moment. Please, try again later');
+        next('Internal error, request could not be satisfied at this moment. Please, '
+            + 'try again later');
     } else {
         log.debug('SQL query: ${ req.sqlQuery }?');
         log.debug(req.sqlQuery);
@@ -297,7 +292,8 @@ enrollmentApp.get('/enrollments', (req, res, next) => {
             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');
+            next('Internal error, request could not be satisfied at this moment. Please, '
+                + 'try again later');
         });
     }
 });
-- 
GitLab