chore(flight): refactor routes

package.json

@@ -8,7 +8,6 @@
     "start": "node src/server.js",
     "test": "NODE_ENV=test gulp test",
     "dev": "nodemon -w server --exec babel-node -- server/server.js",
-    "localtest": "NODE_ENV=test gulp test",
     "migrate": "sequelize db:migrate && npm run seed",
     "mocha": "NODE_ENV=test nyc --reporter=lcov --reporter=text --reporter=html mocha --timeout 90000 --compilers js:babel-register -- ./tests/**/*.spec.js",
     "seed": "sequelize db:seed:all",

server/controllers/documents.js

@@ -31,15 +31,6 @@ export default {
       });
   },
   getAll(req, res) {
-    if (req.query.limit || req.query.offset) {
-      if (!Number.isInteger(Number(req.query.limit))
-        || !Number.isInteger(Number(req.query.offset))) {
-        return res.status(400).send({
-          message: 'Limit and Offset params must be numbers'
-        });
-      }
-    }
-
     Document.findAll()
       .then((response) => {
         const totalCount = response.length;

server/controllers/users.js

@@ -61,15 +61,6 @@ export default {
     });
   },
   getAll(req, res) {
-    if (req.query.limit || req.query.offset) {
-      if (!Number.isInteger(Number(req.query.limit))
-        || !Number.isInteger(Number(req.query.offset))) {
-        return res.status(400).send({
-          message: 'Limit and Offset params must be numbers'
-        });
-      }
-    }
-
     User.findAll()
       .then((response) => {
         const totalCount = response.length;

server/middleware/middleware.js

@@ -146,6 +146,27 @@ export function validateDocument(req, res, next) {
   next();
 }
 
+/**
+ * @description validates limit and offset if they are provided
+ * @function
+ * @param {Object} req
+ * @param {Object} res
+ * @param {callback} next
+ * @returns {json} json error response
+ */
+export function validateLimitAndOffset(req, res, next) {
+  if (req.query.limit || req.query.offset) {
+    if (!Number.isInteger(Number(req.query.limit))
+      || !Number.isInteger(Number(req.query.offset))) {
+      return res.status(400).send({
+        message: 'Limit and Offset params must be numbers'
+      });
+    }
+  }
+
+  next();
+}
+
 /**
  * @description validates login fields
  * @function

server/routes/index.js

@@ -1,11 +1,5 @@
-import documentRoutes from './documents';
-import roleRoutes from './roles';
-import searchRoutes from './search';
-import userRoutes from './users';
+import routes from './routes';
 
 export default (router) => {
-  documentRoutes(router);
-  roleRoutes(router);
-  searchRoutes(router);
-  userRoutes(router);
+  routes(router);
 };

server/routes/routes.js

@@ -0,0 +1,68 @@
+import documentController from '../controllers/documents';
+import rolesController from '../controllers/roles';
+import searchController from '../controllers/search';
+import usersController from '../controllers/users';
+import {
+  authenticate,
+  findDocumentById,
+  findRoleById,
+  findUserById,
+  isAdministrator,
+  validateDocument,
+  validateLimitAndOffset,
+  validateLogin,
+  validateParam,
+  validateQuery,
+  validateRole,
+  validateUser
+} from '../middleware/middleware';
+
+const routes = (router) => {
+  // Document routes
+  router.route('/documents')
+    .get(authenticate, validateLimitAndOffset, documentController.getAll)
+    .post(authenticate, validateDocument, documentController.create);
+
+  router.route('/documents/:id')
+    .get(authenticate, validateParam, findDocumentById, documentController.getOne)
+    .put(authenticate, validateParam, findDocumentById, documentController.update)
+    .delete(authenticate, validateParam, findDocumentById, documentController.delete);
+
+  // Role routes
+  router.route('/roles')
+    .get(authenticate, isAdministrator, rolesController.getAll)
+    .post(authenticate, isAdministrator, validateRole, rolesController.create);
+
+  router.route('/roles/:id')
+    .get(authenticate, isAdministrator, validateParam, findRoleById, rolesController.getOne)
+    .put(authenticate, isAdministrator, validateParam, findRoleById, rolesController.update)
+    .delete(authenticate, isAdministrator, validateParam, findRoleById, rolesController.delete);
+
+  // Search route
+  router.route('/search/users')
+    .get(validateQuery, searchController.searchUser);
+
+  router.route('/search/documents')
+    .get(validateQuery, searchController.searchDocument);
+
+  // User routes
+  router.route('/users/login')
+    .post(validateLogin, usersController.login);
+
+  router.route('/users/logout')
+    .post(usersController.logout);
+
+  router.route('/users')
+    .get(authenticate, isAdministrator, validateLimitAndOffset, usersController.getAll)
+    .post(validateUser, usersController.signup);
+
+  router.route('/users/:id')
+    .get(authenticate, validateParam, findUserById, usersController.getOne)
+    .put(authenticate, validateParam, findUserById, usersController.update)
+    .delete(authenticate, validateParam, findUserById, usersController.delete);
+
+  router.route('/users/:id/documents')
+    .get(authenticate, validateParam, findUserById, usersController.getUserDocuments);
+};
+
+export default routes;