Merge d22cc5a into 81c1f48

andela · Mar 21, 2019 · 4c606b8 · 4c606b8
2 parents 81c1f48 + d22cc5a
commit 4c606b8
Show file tree

Hide file tree

Showing 15 changed files with 558 additions and 155 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 Authors Haven - A Social platform for the creative at heart.
 
-[![Build Status](https://travis-ci.com/andela/vidar-ah-backend.svg?branch=develop)](https://travis-ci.com/andela/vidar-ah-backend) [![Coverage Status](https://coveralls.io/repos/github/andela/vidar-ah-backend/badge.svg?branch=develop)](https://coveralls.io/github/andela/vidar-ah-backend?branch=develop) [![](https://img.shields.io/badge/Protected_by-Hound-a873d1.svg)](https://houndci.com)
+[![Build Status](https://travis-ci.com/andela/vidar-ah-backend.svg?branch=develop)](https://travis-ci.com/andela/vidar-ah-backend) [![Coverage Status](https://coveralls.io/repos/github/andela/vidar-ah-backend/badge.svg?branch=develop)](https://coveralls.io/github/andela/vidar-ah-backend?branch=ft-create-user-article-%23164139686) [![](https://img.shields.io/badge/Protected_by-Hound-a873d1.svg)](https://houndci.com)
 =======
 
 ## Vision

diff --git a/controllers/comment.js b/controllers/comment.js
@@ -1,4 +1,6 @@
-import { Comment, User } from '../models';
+import Sequelize from 'sequelize';
+import { Comment, User, CommentLikes } from '../models';
+import isCommentLikedByUser from '../helpers/isCommentLikedByUser';
 
 /**
  * @class CommentController
@@ -58,10 +60,19 @@ export default class CommentController {
         where: {
           articleSlug
         },
+        group: ['User.username', 'User.bio', 'User.email', 'Comment.id'],
         include: [
           {
             model: User,
             attributes: ['username', 'bio', 'email']
+          },
+          {
+            model: CommentLikes,
+            attributes: [
+              [
+                Sequelize.fn('COUNT', Sequelize.col('CommentLikes.commentId')), 'commentCount'
+              ]
+            ]
           }
         ]
       });
@@ -152,4 +163,46 @@ export default class CommentController {
       });
     }
   }
+
+  /**
+* @description - Like/unlike an article comment
+* @static
+*
+* @param {object} req - HTTP Request
+* @param {object} res - HTTP Response
+*
+* @memberof CommentController
+*
+* @returns {string} Like/unlike comment result
+*/
+  static async likeComment(req, res) {
+    const { id } = req.params;
+    const { id: userId } = req.user;
+    try {
+      // Delete comment like, if already liked by user
+      if (await isCommentLikedByUser(id, userId)) {
+        await CommentLikes.destroy({
+          where: {
+            userId, commentId: id
+          }
+        });
+        return res.status(201).json({
+          success: true,
+          message: 'Comment unliked successfully',
+        });
+      }
+      await CommentLikes.create({
+        userId, commentId: id
+      });
+      return res.status(201).json({
+        success: true,
+        message: 'Comment liked successfully',
+      });
+    } catch (error) {
+      return res.status(500).json({
+        success: false,
+        errors: [error.message]
+      });
+    }
+  }
 }
diff --git a/doc.json b/doc.json
@@ -523,7 +523,45 @@
           }
         }
       }
-
+    },
+    "/comments{id}/like": {
+      "put": {
+        "tags": [
+          "CommentLike"
+        ],
+        "summary": "Like a comment article",
+        "description": "",
+        "operationId": "Like comment",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "name": "authorization",
+            "in": "header",
+            "description": "A token to verify the user",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "header",
+            "name": "id",
+            "description": "Id of comment to like",
+            "required": true
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Article liked/unliked successfully"
+          },
+          "404": {
+            "description": "Comment not found"
+          }
+        }
+      }
     }
   },
   "/articles/{slug}/comments": {

diff --git a/helpers/isCommentLikedByUser.js b/helpers/isCommentLikedByUser.js
@@ -0,0 +1,19 @@
+import { CommentLikes } from '../models';
+
+/**
+ * @description This function checks if a comment has been liked by a user
+ * @param {string} commentId Comment ID
+ * @param {string} userId User id
+ * @returns {boolean} if comment has been liked
+ */
+const isCommentLikedByUser = async (commentId, userId) => {
+  const findComment = await CommentLikes.findOne({
+    where: {
+      userId, commentId
+    }
+  });
+  if (findComment) { return true; }
+  return false;
+};
+
+export default isCommentLikedByUser;
diff --git a/middleware/validation.js b/middleware/validation.js
@@ -207,6 +207,30 @@ export const validateCommentUser = async (req, res, next) => {
     });
   }
 };
+export const validateCommentExist = async (req, res, next) => {
+  const {
+    params: { id }
+  } = req;
+  try {
+    const comment = await Comment.findOne({
+      where: {
+        id
+      }
+    });
+    if (!comment) {
+      return res.status(404).json({
+        success: false,
+        errors: ['Comment not found.']
+      });
+    }
+    return next();
+  } catch (error) {
+    return res.status(500).json({
+      success: false,
+      error: [error.message]
+    });
+  }
+};
 
 export const validateArticleExist = async (req, res, next) => {
   const { slug } = req.params;

diff --git a/migrations/20190318175823-create-comment-likes.js b/migrations/20190318175823-create-comment-likes.js
@@ -0,0 +1,26 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('CommentLikes', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    commentId: {
+      type: Sequelize.INTEGER
+    },
+    userId: {
+      type: Sequelize.INTEGER
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+
+  down: queryInterface => queryInterface.dropTable('CommentLikes'),
+};
diff --git a/models/User.js b/models/User.js
@@ -77,6 +77,10 @@ module.exports = (sequelize, DataTypes) => {
       foreignKey: 'userId',
       onDelete: 'CASCADE'
     });
+    User.hasMany(models.CommentLikes, {
+      foreignKey: 'userId',
+      onDelete: 'CASCADE'
+    });
   };
 
 

diff --git a/models/comment.js b/models/comment.js
@@ -21,6 +21,10 @@ module.exports = (sequelize, DataTypes) => {
       foreignKey: 'userId',
       onDelete: 'CASCADE',
     });
+    Comment.hasMany(models.CommentLikes, {
+      foreignKey: 'commentId',
+      onDelete: 'CASCADE'
+    });
   };
   return Comment;
 };
diff --git a/models/commentlikes.js b/models/commentlikes.js
@@ -0,0 +1,17 @@
+module.exports = (sequelize, DataTypes) => {
+  const CommentLikes = sequelize.define('CommentLikes', {
+    commentId: DataTypes.INTEGER,
+    userId: DataTypes.INTEGER
+  }, {});
+  CommentLikes.associate = (models) => {
+    CommentLikes.belongsTo(models.Comment, {
+      foreignKey: 'commentId',
+      onDelete: 'CASCADE'
+    });
+    CommentLikes.belongsTo(models.User, {
+      foreignKey: 'userId',
+      onDelete: 'CASCADE'
+    });
+  };
+  return CommentLikes;
+};