Merge 8b35f41 into 66fe6aa

andela · Nov 6, 2018 · 922c9ae · 922c9ae
2 parents 66fe6aa + 8b35f41
commit 922c9ae
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/server/controllers/userController.js b/server/controllers/userController.js
@@ -375,13 +375,24 @@ const userController = {
         Users.update(updates, {
           where: {
             id
-          },
-          returning: true,
-          plain: true
-        }).then(user => res.status(200).jsend.success({
-          message: 'Your profile has been updated successfully',
-          user
-        }));
+          }
+        }).then(() => {
+          Users.findById(id, {
+            include: [
+              { model: Articles, as: 'articles' },
+              { model: Ratings, as: 'ratings' },
+              { model: Bookmarks, as: 'bookmarks' },
+              'followed',
+              'follower'
+            ]
+          }).then((user) => {
+            delete user.password;
+            return res.status(200).jsend.success({
+              message: 'Your profile has been updated successfully',
+              user
+            });
+          });
+        });
       };
       if (req.file) {
         const file = dataUri(req);

diff --git a/test/users.test.spec.js b/test/users.test.spec.js
@@ -94,9 +94,9 @@ describe('Update User Endpoint /api/v1/users/update', () => {
       .end((err, res) => {
         expect(res).to.have.status(200);
         expect(res.body).to.be.an('object');
-        expect(res.body.data.user[1].firstname).to.equal('joe');
-        expect(res.body.data.user[1].lastname).to.equal('easy');
-        expect(res.body.data.user[1].bio).to.equal('Hello, here is a brief information about me');
+        expect(res.body.data.user.firstname).to.equal('joe');
+        expect(res.body.data.user.lastname).to.equal('easy');
+        expect(res.body.data.user.bio).to.equal('Hello, here is a brief information about me');
         expect(res.body.data.message).to.equal('Your profile has been updated successfully');
         done();
       });
@@ -117,9 +117,9 @@ describe('Update User Endpoint /api/v1/users/update', () => {
       .type('form')
       .end((err, res) => {
         expect(res).to.have.status(200);
-        expect(res.body.data.user[1].firstname).to.equal('jehonadab');
-        expect(res.body.data.user[1].lastname).to.equal('hehehehehe');
-        expect(res.body.data.user[1].bio).to.equal('Here is a brief information about me');
+        expect(res.body.data.user.firstname).to.equal('jehonadab');
+        expect(res.body.data.user.lastname).to.equal('hehehehehe');
+        expect(res.body.data.user.bio).to.equal('Here is a brief information about me');
         expect(res.body.data.message).to.equal('Your profile has been updated successfully');
         done();
       });