Merge branch 'feedback' into staging

Author: Andela Developer

server/controllers/documents.js

@@ -70,12 +70,7 @@ const updateDocument = (req, res) => {
         });
       }
       return document
-        .update({
-          title: req.body.title || document.title,
-          content: req.body.content || document.content,
-          access: req.body.access || document.access,
-          userId: document.userId
-        })
+        .update(req.body)
         .then(() => res.status(200).send({
           document,
           message: 'Document updated successfully'

server/controllers/roles.js

@@ -94,9 +94,7 @@ const updateRole = (req, res) => {
         });
       }
       return role
-        .update({
-          title: req.body.title || role.title
-        })
+        .update(req.body)
         .then(() => res.status(200).json({
           message: 'Role updated successfully',
           role

server/controllers/users.js

@@ -190,13 +190,12 @@ const updateUser = (req, res) => {
         if (!user) {
           return res.status(404).json({ message: 'User not found' });
         }
+
+        if (req.body.password) {
+          req.body.password = hash;
+        }
         return user
-          .update({
-            fullName: req.body.fullName || user.fullName,
-            userName: req.body.userName || user.userName,
-            email: req.body.email || user.email,
-            password: hash || user.password,
-          })
+          .update(req.body)
           .then((updatedUser) => {
             res.status(200).send({
               userUpdate: {

server/test/models/user.spec.js

@@ -5,12 +5,6 @@ import helper from '../controllers/mockData';
 const expect = chai.expect;
 
 describe('User Model', () => {
-  const requiredFields = [
-    'userName',
-    'fullName',
-    'email',
-    'password'
-  ];
   const uniqueFields = ['userName', 'email'];
   const defaultRoleId = 2;
   let regularUser;