Merge 925eaff into ad85cb6

andela · May 30, 2019 · a232cc2 · a232cc2
2 parents ad85cb6 + 925eaff
commit a232cc2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/server/controllers/comment.controller.js b/server/controllers/comment.controller.js
@@ -72,6 +72,7 @@ const post = async (req, res) => {
         createdAt: comment.createdAt,
         updatedAt: comment.updatedAt,
         likes_count: comment.likes_count,
+        user_id: comment.user_id,
         commentOwner,
       },
     });
@@ -127,6 +128,7 @@ const updateComment = async (req, res) => {
     await CommentHistory.create({
       comment_id: res.locals.comment.id,
       body: res.locals.comment.body,
+      createdAt: res.locals.comment.updatedAt,
     });
   }
 

diff --git a/server/helpers/comment-helpers.js b/server/helpers/comment-helpers.js
@@ -38,17 +38,24 @@ const getCommentAndHistories = async (Comment, CommentHistory, commentid) => {
       where: {
         id: commentid,
       },
-      attributes: ['id', 'likes_count', 'user_id', 'body', 'createdAt'],
+      attributes: [
+        'id',
+        'likes_count',
+        'user_id',
+        'body',
+        'createdAt',
+        'updatedAt',
+      ],
       include: [
         {
           model: CommentHistory,
           required: false,
           as: 'histories',
           order: ['body'],
-          attributes: ['id', 'comment_id', 'body', 'updatedAt'],
+          attributes: ['id', 'comment_id', 'body', 'updatedAt', 'createdAt'],
         },
       ],
-      order: [['histories', 'updatedAt', 'desc']],
+      order: [['histories', 'updatedAt', 'asc']],
     });
   } catch (err) {
     return err;

diff --git a/tests/comment.test.js b/tests/comment.test.js
@@ -172,13 +172,15 @@ describe('GET COMMENTS AND EDIT HISTORIES', () => {
           'body',
           'createdAt',
           'histories',
-          'likes_count'
+          'likes_count',
+          'updatedAt'
         );
         expect(res.body.comment[0].histories[0]).to.have.all.keys(
           'id',
           'body',
           'comment_id',
-          'updatedAt'
+          'updatedAt',
+          'createdAt'
         );
         expect(res.body.comment[0].histories[0].body).equal('deep write up');
         done();