chore(comment): add field depicting if user has liked comment

[Finishes #165680926]
andela · Apr 29, 2019 · 5bf20bb · 5bf20bb
1 parent 883b574
commit 5bf20bb
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/server/controllers/articleComment.js b/server/controllers/articleComment.js
@@ -8,7 +8,8 @@ const {
   User,
   Notification,
   UserNotification,
-  CommentEditHistory
+  CommentEditHistory,
+  ArticleCommentLike
 } = models;
 
 /**
@@ -25,8 +26,9 @@ class Comment {
    * @returns {object} - The comment object
    */
   static async getComments(req, res) {
-    const articleId = req.article.id;
-    const comments = await ArticleComment.findAll({
+    const { user, article } = req;
+    const articleId = article.id;
+    let comments = await ArticleComment.findAll({
       where: {
         articleId
       },
@@ -38,6 +40,21 @@ class Comment {
         }
       ]
     });
+    if (user.id) {
+      comments = await Promise.all(comments.map(async (comment) => {
+        const userLike = await ArticleCommentLike.findOne({
+          where: {
+            userId: user.id,
+            commentId: comment.dataValues.id,
+            articleId: comment.dataValues.articleId
+          }
+        });
+        return {
+          ...comment.dataValues,
+          hasLiked: Boolean(userLike)
+        };
+      }));
+    }
     return response(res).success({
       message: 'Comments successfully retrieved',
       comments

diff --git a/server/routes/articles.js b/server/routes/articles.js
@@ -42,6 +42,7 @@ router.post('/articles/:slug/highlight',
 
 router.get('/articles/:slug/comments',
   AuthenticateArticle.verifyArticle,
+  AuthenticateUser.identifyUser,
   Comment.getComments);
 
 router.get('/articles/tags',

diff --git a/server/test/comment.spec.js b/server/test/comment.spec.js
@@ -169,9 +169,27 @@ describe('PATCH update comment', () => {
 });
 
 describe('GET comments of a single article', () => {
+  before((done) => {
+    chai
+      .request(app)
+      .post('/api/users')
+      .send({
+        firstname: 'Chris',
+        lastname: 'James',
+        email: 'chr2@gmail.com',
+        username: 'Chr2',
+        password: '12345678'
+      })
+      .end((err, res) => {
+        const { token } = res.body.user;
+        userToken = token;
+        done(err);
+      });
+  });
   it('should return 200 and get comments for an article', (done) => {
     chai.request(app)
       .get('/api/articles/this-is-an-article-1/comments')
+      .set('authorization', `Bearer ${userToken}`)
       .end((err, res) => {
         expect(res.status).to.be.equal(200);
         expect(res.body.message).to.be.equal('Comments successfully retrieved');