refactoring

marcelo-trajano · Jun 30, 2020 · 03d7fb8 · 03d7fb8
1 parent 5ce4113
commit 03d7fb8
Show file tree

Hide file tree

Showing 17 changed files with 148 additions and 149 deletions.
diff --git a/app.js b/app.js
@@ -11,9 +11,10 @@ const project = require(`./routes/project`);
 const feature = require(`./routes/feature`);
 const admin = require(`./routes/admin`);
 const bug = require(`./routes/bug`);
+const error = require(`./routes/error`);
+const api = require(`./routes/api`);
 const session = require("express-session");
 const flash = require("connect-flash");
-const StatusProject = require(`./models/StatusProject`);
 const Project = require(`./models/Project`);
 const FeatureStatus = require(`./models/FeatureStatus`);
 const StatusProgress = require(`./models/StatusProgress`);
@@ -58,54 +59,8 @@ app.use(`/project`, project);
 app.use(`/feature`, feature);
 app.use(`/admin`, admin);
 app.use(`/bug`, bug);
-
-app.get("/", function (req, res) {
-  res.render(`index`);
-});
-
-app.get("/css", function (req, res) {
-  res.render(`teste_css`);
-});
-
-app.get(`/api`, (req, res) => {
-  StatusProject.findAll(async function (results) {
-    res.send(results);
-  });
-});
-
-app.get(`/api/getActiveProjects`, (req, res) => {
-  Project.findAll(async function (results) {
-    res.send(results);
-  });
-});
-
-app.get(`/api/getFeatureStatus`, (req, res) => {
-  FeatureStatus.findAll(async function (results) {
-    res.send(results);
-  });
-});
-
-app.get(`/api/getStatusProgress`, (req, res) => {
-  StatusProgress.findAll(async function (results) {
-    res.send(results);
-  });
-});
-
-app.get(`/api/getStatus`, (req, res) => {
-  StatusProgress.getStatus()
-    .then(function (results) {
-      res.send(results);
-    })
-    .catch(function (err) {
-      req.flash("error_msg", "ERROR" + err);
-      res.redirect(`/project`);
-    });
-});
-
-app.get(`/api/getStatus2`, async (req, res) => {
-  let result = await StatusProgress.getStatus();
-  res.send(result);
-});
+app.use(`/error`, error);
+app.use(`/api`, api);
 
 app.listen(SERVER_PORT, () => {
   console.log("Server listening on port " + SERVER_PORT);

diff --git a/models/Bug.js b/models/Bug.js
@@ -1,3 +1,4 @@
+const mysql = require("mysql");
 const connection = require("../db/connection");
 
 const create = async function (bug, callback) {
@@ -47,13 +48,12 @@ const findAll = async function (callback) {
   });
 };
 
-const getBugsByProject = async function (id, callback) {
-  let sql = `select * from bugs where projectid=${id}`;
-
-  connection.query(sql, function (err, results) {
-    if (err) throw err;
-    console.log(sql);
-    return callback(results);
+const getBugsByProject = (id) => {
+  return new Promise((resolve, reject) => {
+    let sql = `select * from bugs where projectid=${mysql.escape(id)}`;
+    connection.query(sql, (err, results) => {
+      err ? reject(err) : resolve(results);
+    });
   });
 };
 

diff --git a/models/FeatureStatus.js b/models/FeatureStatus.js
@@ -6,13 +6,12 @@ const STATUS = {
   CLOSED: 4,
 };
 
-const findAll = async function (callback) {
-  let sql = `SELECT * FROM FeatureStatus`;
-
-  connection.query(sql, async function (err, result) {
-    if (err) throw err;
-    console.log(sql);
-    return callback(result);
+const findAll = () => {
+  return new Promise((resolve, reject) => {
+    let sql = `SELECT * FROM FeatureStatus`;
+    connection.query(sql, (err, result) => {
+      err ? reject(err) : resolve(result);
+    });
   });
 };
 

diff --git a/models/Priority.js b/models/Priority.js
@@ -1,12 +1,11 @@
 const connection = require("../db/connection");
 
-const findAll = async function (callback) {
-  let sql = `SELECT * FROM Priority`;
-
-  connection.query(sql, async function (err, result) {
-    if (err) throw err;
-    console.log(sql);
-    return callback(result);
+const findAll = () => {
+  return new Promise((resolve, reject) => {
+    let sql = `SELECT * FROM Priority`;
+    connection.query(sql, (err, result) => {
+      err ? reject(err) : resolve(result);
+    });
   });
 };
 

diff --git a/models/Project.js b/models/Project.js
@@ -26,16 +26,17 @@ const update = async function (obj, callback) {
   });
 };
 
-const findAll = async function (callback) {
-  let sql = `select p.ID as ID, p.NameProject, DATE_FORMAT(p.StartDate,'%Y-%m-%d') as StartDate , DATE_FORMAT(p.EndDate,'%Y-%m-%d') as EndDate, p.DescriptionProject, sp.ID as StatusID, sp.StatusName 
+const findAll = () => {
+  return new Promise((resolve, reject) => {
+    let sql = `select p.ID as ID, p.NameProject, DATE_FORMAT(p.StartDate,'%Y-%m-%d') as StartDate , DATE_FORMAT(p.EndDate,'%Y-%m-%d') as EndDate, p.DescriptionProject, sp.ID as StatusID, sp.StatusName 
         from projects as p
         inner join statusproject as sp
         on p.StatusID = sp.ID 
         ORDER BY ID DESC`;
-  connection.query(sql, async function (err, result) {
-    if (err) throw err;
-    console.log(sql);
-    return callback(result);
+
+    connection.query(sql, (err, result) => {
+      err ? reject(err) : resolve(result);
+    });
   });
 };
 

diff --git a/models/Severity.js b/models/Severity.js
@@ -1,12 +1,11 @@
 const connection = require("../db/connection");
 
-const findAll = async function (callback) {
-  let sql = `SELECT * FROM Severity`;
-
-  connection.query(sql, async function (err, result) {
-    if (err) throw err;
-    console.log(sql);
-    return callback(result);
+const findAll = () => {
+  return new Promise((resolve, reject) => {
+    let sql = `SELECT * FROM Severity`;
+    connection.query(sql, (err, result) => {
+      err ? reject(err) : resolve(result);
+    });
   });
 };
 

diff --git a/models/StatusProgress.js b/models/StatusProgress.js
@@ -5,32 +5,16 @@ const StatusProgressValue = {
   DONE: 10,
 };
 
-const findAll = async function (callback) {
-  let sql = `SELECT * FROM StatusProgress`;
-
-  connection.query(sql, async function (err, result) {
-    if (err) throw err;
-    console.log(sql);
-    return callback(result);
-  });
-};
-
-async function getStatus() {
+const findAll = () => {
   return new Promise((resolve, reject) => {
     let sql = `SELECT * FROM StatusProgress`;
-    connection.cachedPool().query(sql, (err, results) => {
-      //if (err) throw err;
-      if (err) {
-        reject(err);
-      } else {
-        resolve(results);
-      }
+    connection.query(sql, (err, results) => {
+      err ? reject(err) : resolve(results);
     });
   });
-}
+};
 
 module.exports = {
   StatusProgressValue: StatusProgressValue,
   findAll: findAll,
-  getStatus: getStatus,
 };
diff --git a/models/StatusProject.js b/models/StatusProject.js
@@ -1,26 +1,15 @@
 const mysql = require("mysql");
 const connection = require("../db/connection");
 
-const create = async function (obj, callback) {
-  let sql = `INSERT INTO StatusProject (${obj.field}) VALUES ('${obj.value}')`;
-  connection.query(sql, function (err, result) {
-    if (err) throw err;
-    console.log(sql);
-    findByPK(result.insertId, function (result) {
-      return callback(result);
+const findAll = () => {
+  return new Promise((resolve, reject) => {
+    let sql = `SELECT * FROM statusproject`;
+    connection.query(sql, (err, result) => {
+      err ? reject(err) : resolve(result);
     });
   });
 };
 
-const findAll = async function (callback) {
-  let sql = `SELECT * FROM statusproject`;
-  connection.query(sql, async function (err, result) {
-    if (err) throw err;
-    console.log(sql);
-    return callback(result);
-  });
-};
-
 const findByPK = async function (id, callback) {
   let sql = `SELECT * FROM statusproject 
         where id=${mysql.escape(id)}`;
@@ -32,4 +21,4 @@ const findByPK = async function (id, callback) {
   });
 };
 
-module.exports = { create: create, findByPK: findByPK, findAll: findAll };
+module.exports = { findByPK: findByPK, findAll: findAll };
diff --git a/routes/api.js b/routes/api.js
@@ -0,0 +1,81 @@
+const express = require(`express`);
+const router = express.Router();
+const StatusProject = require(`../models/StatusProject`);
+const Project = require(`../models/Project`);
+const FeatureStatus = require(`../models/FeatureStatus`);
+const StatusProgress = require(`../models/StatusProgress`);
+const Severity = require(`../models/Severity`);
+const Priority = require(`../models/Priority`);
+const Bug = require(`../models/Bug`);
+
+router.get(`/getStatusProject`, (req, res) => {
+  StatusProject.findAll()
+    .then((results) => {
+      res.send(results);
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
+});
+
+router.get(`/getActiveProjects`, (req, res) => {
+  Project.findAll()
+    .then((result) => {
+      res.send(result);
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
+});
+
+router.get(`/getFeatureStatus`, (req, res) => {
+  FeatureStatus.findAll()
+    .then((Status) => {
+      res.send(Status);
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
+});
+
+router.get(`/getStatusProgress`, (req, res) => {
+  StatusProgress.findAll()
+    .then((results) => {
+      res.send(results);
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
+});
+
+router.get(`/getSeverity`, (req, res) => {
+  Severity.findAll()
+    .then((results) => {
+      res.send(results);
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
+});
+
+router.get(`/getPriority`, (req, res) => {
+  Priority.findAll()
+    .then((results) => {
+      res.send(results);
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
+});
+
+router.get(`/getBugsByProject/:id`, (req, res) => {
+  Bug.getBugsByProject(req.params.id)
+    .then((results) => {
+      res.send(results);
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
+});
+
+module.exports = router;
diff --git a/routes/bug.js b/routes/bug.js
@@ -1,8 +1,6 @@
 const express = require(`express`);
 const router = express.Router();
 const Bug = require(`../models/Bug`);
-const Severity = require(`../models/Severity`);
-const Priority = require(`../models/Priority`);
 const Project = require(`../models/Project`);
 const moment = require("moment");
 
@@ -53,22 +51,4 @@ router.post(`/solveIssue`, (req, res) => {
   });
 });
 
-router.get(`/getSeverity`, (req, res) => {
-  Severity.findAll((results) => {
-    res.send(results);
-  });
-});
-
-router.get(`/getPriority`, (req, res) => {
-  Priority.findAll((results) => {
-    res.send(results);
-  });
-});
-
-router.get(`/getBugsByProject/:id`, (req, res) => {
-  Bug.getBugsByProject(req.params.id, (results) => {
-    res.send(results);
-  });
-});
-
 module.exports = router;
diff --git a/routes/error.js b/routes/error.js
@@ -0,0 +1,8 @@
+const express = require(`express`);
+const router = express.Router();
+
+router.get(`/`, (req, res) => {
+  res.render(`error/error`);
+});
+
+module.exports = router;
diff --git a/routes/project.js b/routes/project.js
@@ -3,9 +3,13 @@ const router = express.Router();
 const Project = require(`../models/Project`);
 
 router.get(`/`, (req, res) => {
-  Project.findAll(function (results) {
-    res.render("project/project", { Projects: results });
-  });
+  Project.findAll()
+    .then((result) => {
+      res.render("project/project", { Projects: result });
+    })
+    .catch((err) => {
+      req.flash("error_msg", "ERROR" + err);
+    });
 });
 
 router.get(`/new`, (req, res) => {