some best practice

api/controllers/shift-controller.js

@@ -0,0 +1,56 @@
+const controller = require("../controllers/shift-engine")();
+let reqParser = require('../helpers/req-parser');
+reqParser = new reqParser();
+
+// console.log(reqParser.lengthParser('1%7C2'));
+
+exports.shiftMaker = function(req, res, next) {
+  if (isNaN(parseInt(req.query.length))) {
+    res.status(422).json({
+      error: "the query isnt a valid format"
+    });
+  } else {
+    return res.status(200).json(
+      controller.makeShifts(
+        parseInt(req.query.length),
+        controller
+          .getData()
+          .monthObj()
+      )
+    );
+    // use return to prevent running through middleware twice
+  }
+  next();
+};
+
+exports.leaveMaker = function(req, res, next) {
+  if (isNaN(parseInt(req.query.length) && parseInt(req.query.levelNo))) {
+    res.status(422).json({
+      error: "Error! Incorrect Query Format"
+    });
+  } else {
+    let result = [];
+    const levelArr = reqParser.lengthParser(req.query.levelNo);
+
+    if (req.query.length.includes('|') || req.query.levelNo.includes('|')) {
+      for (let i = 0; i < levelArr.length; i++) {
+        result.push(controller.makeLeaveSchedules(
+          parseInt(levelArr[i]),
+          parseInt(req.query.length)
+        )[0]);
+      }
+      return res.status(200).json(result);
+    } else {
+      // use return to prevent running through middleware twice
+      return res
+        .status(200)
+        .json(
+          controller.makeLeaveSchedules(
+            parseInt(req.query.levelNo),
+            parseInt(req.query.length)
+          )
+        );
+    }
+  }
+  next();
+};

api/controllers/app.js → api/controllers/shift-engine.js

@@ -67,7 +67,7 @@ const dataCtrl = () => {
           break;
 
         default:
-          return "level doesnt exist";
+          return "level doesn't exist";
       }
       return a;
     }

api/helpers/req-parser.js

@@ -0,0 +1,15 @@
+class reqParser {
+  constructor(){}
+  lengthParser(length) {
+    let lengthArr = length.split('|');
+    console.log(lengthArr);
+    lengthArr = lengthArr.map(cur => {
+      console.log(cur);
+      return parseInt(cur);
+    });
+    console.log(lengthArr);
+    return lengthArr;
+  }
+}
+
+module.exports = reqParser;

api/middlewares/check-auth-query.js

@@ -0,0 +1,16 @@
+exports.shiftVerification = (req, res, next) => {
+  const bool = req.query.length !== undefined && req.query.length !== null && req.query.length !== '';
+  if (bool) {
+    next();
+  } else {
+    res.status(404).json({message: 'Error! Please check your query and try again'});
+  }
+};
+exports.leaveVerification = (req, res, next) => {
+  const bool = (req.query.length !== undefined && req.query.length !== null && req.query.length !== '') && (req.query.levelNo !== undefined && req.query.levelNo !== null && req.query.levelNo !== '');
+  if (bool) {
+    next();
+  } else {
+    res.status(404).json({message: 'Error! Please check your query and try again'});
+  }
+};

api/routes/routes.js

@@ -1,45 +1,12 @@
 const express = require("express");
 const router = express.Router();
-const controller = require("../controllers/app");
+const shift = require('../controllers/shift-controller');
+const authCheck = require('../middlewares/check-auth-query');
 
 // route for shift schedule, req.params returns an object to passed into right function
-router.get("/shifts", function(req, res, next) {
-  if (isNaN(parseInt(req.query.length))) {
-    res.status(422).json({
-      error: "the query isnt a valid format"
-    });
-  } else {
-    // use return to prevent running through middleware twice
-    return res.status(200).json(
-      controller().makeShifts(
-        parseInt(req.query.length),
-        controller()
-          .getData()
-          .monthObj()
-      )
-    );
-  }
-  next();
-});
+router.get("/shifts", authCheck.shiftVerification, shift.shiftMaker);
 
 // route for leave schedule, and req.query/req.params returns an object to passed into the right function buh req.query will be used
-router.get("/leaveSchedules", function(req, res, next) {
-  if (isNaN(parseInt(req.query.length) && parseInt(req.query.levelNo))) {
-    res.status(422).json({
-      error: "the query isnt a valid format"
-    });
-  } else {
-    // use return to prevent running through middleware twice
-    return res
-      .status(200)
-      .json(
-        controller().makeLeaveSchedules(
-          parseInt(req.query.levelNo),
-          parseInt(req.query.length)
-        )
-      );
-  }
-  next();
-});
+router.get("/leaveSchedules", authCheck.leaveVerification,  shift.leaveMaker);
 
 module.exports = router;