merge feedback

Author: Andela Developer

server/config/config.js

@@ -10,12 +10,7 @@ module.exports = {
     dialect: 'postgres'
   },
   test: {
-    username: 'andeladeveloper',
-    password: null,
-    database: 'docmanager-test',
-    host: '127.0.0.1',
-    port: 5432,
-    dialect: 'postgres'
+    use_env_variable: 'TEST_DB'
   },
   production: {
     use_env_variable: 'PRODUCTION_DB',

server/controllers/documents.js

@@ -1,4 +1,4 @@
-import helper from '../helpers/helper';
+import helper from '../helpers/pagination';
 import models from '../models';
 
 const User = models.User;
@@ -174,21 +174,21 @@ const findDocument = (req, res) => {
         res.status(404).json({ message: 'Document not found' });
       }
       if (req.decoded.roleId === 1) {
-        return document;
+        return res.status(200).send({ document });
       }
       if (document.access === 'public') {
-        return res.status(200).send(document);
+        return res.status(200).send({ document });
       }
       if (document.access === 'private') {
         if (document.userId !== req.decoded.id) {
           return res.status(403).json({
             message: 'You are not authorized to view this document'
           });
         }
-        return res.status(200).send(document);
+        return res.status(200).send({ document });
       }
       if (document.access === 'role') {
-        return models.User
+        return User
           .findById(document.userId)
           .then((documentOwner) => {
             if (
@@ -198,7 +198,7 @@ const findDocument = (req, res) => {
                 message: 'You are not authorized to view this document'
               });
             }
-            return res.status(200).send(document);
+            return res.status(200).send({ document });
           })
           .catch(error => res.status(400).send(error));
       }
@@ -240,7 +240,7 @@ const deleteDocument = (req, res) => {
     .catch(error => res.status(400).send(error));
 };
 
-export default {
+module.exports = {
   createDocument,
   updateDocument,
   getAllDocument,

server/controllers/roles.js

@@ -8,7 +8,7 @@ const Role = models.Role;
  * @param {object} res - new created role
  * @returns {object} - newly created role
  */
-function createRole(req, res) {
+const createRole = (req, res) => {
   req.check('title', 'Title is required').notEmpty();
 
   const errors = req.validationErrors();
@@ -32,28 +32,28 @@ function createRole(req, res) {
       }
     }).catch(error => res.json(error));
   }
-}
+};
 
 /**
  * Get all roles.
  * @param {void} req - no request body attached
  * @param {array} res - an array of roles and their id
  * @returns {array} array of roles
  */
-function getRoles(req, res) {
-  return Role
+const getRoles = (req, res) => {
+  Role
     .findAll()
     .then(roles => res.status(200).json({ roles }))
     .catch(error => res.json(error));
-}
+};
 
 /**
  * Find roles by Id.
  * @param {number} req - requested role
  * @param {object} res - role found by id
  * @returns {object} - role found by id
  */
-function findRole(req, res) {
+const findRole = (req, res) => {
   if (isNaN(req.params.id)) {
     res.status(403).json({
       message: `invalid input syntax for integer: "${req.params.id}"`
@@ -72,15 +72,15 @@ function findRole(req, res) {
         message: 'out of range for type integer'
       }));
   }
-}
+};
 
 /**
  * Update role.
  * @param {number} req - requested role by id
  * @param {object} res - updated role
  * @returns {object} - updated role status
  */
-function updateRole(req, res) {
+const updateRole = (req, res) => {
   if (req.decoded.roleId !== 1) {
     return res.status(401)
       .json({ message: 'You are not authorized' });
@@ -105,15 +105,15 @@ function updateRole(req, res) {
     }).catch(() => res.status(400).json({
       message: 'out of range for type integer'
     }));
-}
+};
 
 /**
  * Delete roles by Id.
  * @param {number} req - role to be deleted by id
  * @param {object} res - deleted role
  * @returns {object} - message
  */
-function deleteRole(req, res) {
+const deleteRole = (req, res) => {
   if (req.decoded.roleId !== 1) {
     return res.status(401)
       .json({ message: 'You are not authorized' });
@@ -134,6 +134,6 @@ function deleteRole(req, res) {
     }).catch(() => res.status(400).json({
       message: 'out of range for type integer'
     }));
-}
+};
 
-export default { createRole, getRoles, findRole, updateRole, deleteRole };
+module.exports = { createRole, getRoles, findRole, updateRole, deleteRole };

server/controllers/search.js

@@ -1,4 +1,4 @@
-import helper from '../helpers/helper';
+import helper from '../helpers/pagination';
 import models from '../models';
 
 const Document = models.Document;
@@ -40,7 +40,7 @@ const searchUser = (req, res) => {
       pagination: pagination(count, limit, offset)
     });
   }).catch(error => res.status(400).send(error));
-}
+};
 
 /**
    *
@@ -50,26 +50,25 @@ const searchUser = (req, res) => {
    * @returns {array} - searched document
    */
 const searchDocuments = (req, res) => {
-  const searchQuery = [];
   const limit = req.query.limit || 6,
     offset = req.query.offset || 0,
     queryString = req.query.q.replace(/ +(?= )/g, ''),
-    splitString = queryString.trim().split(' ');
-
-  splitString.forEach((query) => {
-    const output = { $iLike: `%${query}%` };
-    searchQuery.push(output);
-  });
-
-  console.log(splitString);
+    searchQuery = [];
 
-  if (!splitString) {
+  if (!queryString) {
     return res.status(400).json({
       message: 'Invalid search input'
     });
   }
 
   if (req.decoded.roleId === 1) {
+    const splitString = queryString.trim().split(' ');
+
+    splitString.forEach((query) => {
+      const output = { $iLike: `%${query}%` };
+      searchQuery.push(output);
+    });
+
     return Document.findAndCountAll({
       limit,
       offset,
@@ -135,4 +134,4 @@ const searchDocuments = (req, res) => {
   }
 };
 
-export default { searchUser, searchDocuments };
+module.exports = { searchUser, searchDocuments };

server/controllers/users.js

@@ -1,7 +1,7 @@
 import bcrypt from 'bcrypt';
 import jwt from 'jsonwebtoken';
 
-import helper from '../helpers/helper';
+import helper from '../helpers/pagination';
 import models from '../models';
 
 require('dotenv').config();
@@ -88,7 +88,6 @@ const createUser = (req, res) => {
  * @param {object} res - authenicated user details
  * @returns {object} - an object of the logged in user and a token
  */
-
 const login = (req, res) => {
   req.check('email', 'Email is required').notEmpty();
   req.check('email', 'Please put a valid email').isEmail();
@@ -144,7 +143,7 @@ const findUser = (req, res) => {
   const userQuery = Number(req.params.id);
   if (isNaN(userQuery)) {
     return res.status(400).json({
-      message: `invalid input syntax for integer: "${req.params.id}"`
+      message: `invalid input syntax for integer: ${req.params.id}`
     });
   }
   if ((req.decoded.id !== userQuery) && (req.decoded.roleId !== 1)) {
@@ -278,7 +277,7 @@ const getUserDocuments = (req, res) => {
     .catch(error => res.status(400).send(error));
 };
 
-export default {
+module.exports = {
   getUsers,
   createUser,
   login,

server/helpers/helper.js server/helpers/pagination.jsserver/helpers/helper.js renamed to server/helpers/pagination.js

@@ -47,4 +47,4 @@ const adminAccess = (req, res, next) => {
   }
 };
 
-export default { verifyToken, adminAccess };
+module.exports = { verifyToken, adminAccess };

server/middlewares/auth.js

@@ -3,20 +3,35 @@ module.exports = (sequelize, DataTypes) => {
   const Document = sequelize.define('Document', {
     title: {
       type: DataTypes.STRING,
-      allowNull: false
+      allowNull: false,
+      validate: {
+        notEmpty: {
+          msg: 'This field cannot be empty'
+        }
+      }
     },
     content: {
       type: DataTypes.TEXT,
-      allowNull: false
+      allowNull: false,
+      validate: {
+        notEmpty: {
+          msg: 'This field cannot be empty'
+        }
+      }
     },
     userId: {
       type: DataTypes.INTEGER,
       unique: true,
-      allowNull: false
+      allowNull: false,
     },
     access: {
       type: DataTypes.ENUM,
-      values: ['public', 'private', 'role']
+      values: ['public', 'private', 'role'],
+      validate: {
+        notEmpty: {
+          msg: 'This field cannot be empty'
+        }
+      }
     }
   });
   Document.associate = (models) => {

server/models/document.js

@@ -7,12 +7,24 @@ module.exports = (sequelize, DataTypes) => {
     userName: {
       type: DataTypes.STRING,
       allowNull: false,
-      unique: true
+      unique: {
+        args: true,
+        msg: 'userName already exist'
+      }
     },
     email: {
       type: DataTypes.STRING,
       allowNull: false,
-      unique: true
+      unique: {
+        args: true,
+        msg: 'email already exist'
+      },
+      validate: {
+        isEmail: {
+          args: true,
+          msg: 'Input a valid email address'
+        }
+      }
     },
     password: {
       type: DataTypes.STRING,