Merge 2a1de0a into 77e20c2

andela · Mar 26, 2019 · 68b6981 · 68b6981
2 parents 77e20c2 + 2a1de0a
commit 68b6981
Show file tree

Hide file tree

Showing 16 changed files with 546 additions and 176 deletions.
diff --git a/controllers/comment.js b/controllers/comment.js
@@ -1,4 +1,5 @@
-import { Comment, User } from '../models';
+import Sequelize from 'sequelize';
+import { Comment, User, commentLikes } from '../models';
 
 /**
  * @class CommentController
@@ -58,10 +59,20 @@ export default class CommentController {
         where: {
           articleSlug
         },
+        group: ['User.username', 'User.bio', 'User.email', 'Comment.id'],
         include: [
           {
             model: User,
             attributes: ['username', 'bio', 'email']
+          },
+          {
+            as: 'likes',
+            model: commentLikes,
+            attributes: [
+              [
+                Sequelize.fn('COUNT', Sequelize.col('likes.id')), 'commentCount'
+              ]
+            ]
           }
         ]
       });
@@ -152,4 +163,48 @@ 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;
+    const currentUser = await User.findOne({ where: { id: userId } });
+    const currentComment = await Comment.findOne({ where: { id } });
+    const userHasLiked = await currentUser.hasCommentLiked(currentComment.id);
+    try {
+      if (userHasLiked) {
+        await commentLikes.destroy({
+          where: {
+            userId, commentId: id
+          }
+        });
+        return res.status(201).json({
+          success: true,
+          message: 'Comment unliked successfully',
+          comment: currentComment
+        });
+      }
+      await currentUser.addCommentLiked(currentComment.id);
+      return res.status(201).json({
+        success: true,
+        message: 'Comment liked successfully',
+        comment: currentComment
+      });
+    } 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/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/20190313092713-create-comment.js b/migrations/20190313092713-create-comment.js
@@ -8,8 +8,7 @@ module.exports = {
     },
     comment: {
       type: Sequelize.STRING,
-      allowNull: false,
-      unique: true
+      allowNull: false
     },
     articleSlug: {
       type: Sequelize.STRING

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
@@ -82,6 +82,12 @@ module.exports = (sequelize, DataTypes) => {
       as: 'view',
       through: models.stats
     });
+    User.belongsToMany(models.Comment, {
+      as: 'commentLiked',
+      through: models.commentLikes,
+      foreignKey: 'userId',
+      targetKey: 'commentId'
+    });
   };
 
   User.hook('beforeValidate', (user) => {

diff --git a/models/comment.js b/models/comment.js
@@ -4,10 +4,6 @@ module.exports = (sequelize, DataTypes) => {
     comment: {
       allowNull: false,
       type: DataTypes.STRING,
-      unique: {
-        args: true,
-        msg: 'The comment already exists'
-      }
     },
     articleSlug: DataTypes.STRING,
     userId: DataTypes.INTEGER
@@ -21,6 +17,12 @@ module.exports = (sequelize, DataTypes) => {
       foreignKey: 'userId',
       onDelete: 'CASCADE',
     });
+    Comment.hasMany(models.commentLikes, {
+      as: 'likes',
+      foreignKey: 'commentId',
+      onDelete: 'CASCADE'
+    });
+    Comment.belongsToMany(models.User, { as: 'commentLiker', through: models.commentLikes, foreignKey: 'commentId' });
   };
   return Comment;
 };
diff --git a/models/commentlikes.js b/models/commentlikes.js
@@ -0,0 +1,7 @@
+module.exports = (sequelize, DataTypes) => {
+  const commentLikes = sequelize.define('commentLikes', {
+    commentId: DataTypes.INTEGER,
+    userId: DataTypes.INTEGER
+  }, {});
+  return commentLikes;
+};