bug(fix-comment-id):To return the comment Id

src/controllers/article.controller.js

@@ -397,10 +397,10 @@ export default {
    */
 
   async likeComment(request, response) {
-    const { id } = request.user;
+    const { id, email } = request.user;
     const { slug, commentId } = request.params;
 
-    const result = await likeCommentService(slug, commentId, id);
+    const result = await likeCommentService(slug, commentId, id, email);
 
     if (result === `The article with the specified slug does not exist`) {
       return Helper.failResponse(response, 404, {

src/db/migrations/20190712173952-create-comment-reaction.js

@@ -18,6 +18,12 @@ module.exports = {
           }
         }
       },
+      email: {
+        type: Sequelize.STRING,
+        allowNull: {
+          args: false
+        }
+      },
       commentId: {
         type: Sequelize.INTEGER,
         allowNull: {

src/db/models/comment.js

@@ -55,6 +55,11 @@ export default (sequelize, DataTypes) => {
       onDelete: 'CASCADE'
     });
 
+    Comment.hasMany(models.CommentReaction, {
+      foreignKey: 'commentId',
+      as: 'commentLikes'
+    });
+
     Comment.belongsTo(models.Article, {
       foreignKey: 'articleId',
       as: 'articleComment',

src/db/models/commentReaction.js

@@ -11,6 +11,12 @@ module.exports = (sequelize, DataTypes) => {
         }
       }
     },
+    email: {
+      type: DataTypes.STRING,
+      allowNull: {
+        args: false
+      }
+    },
     commentId: {
       type: DataTypes.INTEGER,
       allowNull: {

src/services/article.service.js

@@ -523,12 +523,16 @@ export const getAllArticleCommentsService = async slug => {
   const articleId = article.id;
   const comments = await Comment.findAll({
     where: { articleId },
-    attributes: ['body', 'highlightedText', 'slug', 'createdAt'],
+    attributes: ['id', 'body', 'highlightedText', 'slug', 'createdAt'],
     include: [
       {
         model: User,
         as: 'userComment',
-        attributes: ['firstName', 'lastName', 'userName']
+        attributes: ['firstName', 'lastName', 'userName', 'email']
+      },
+      {
+        model: CommentReaction,
+        as: 'commentLikes'
       }
     ]
   });
@@ -620,7 +624,7 @@ export const getCommentLikesCount = async commentId => {
     where: { commentId }
   });
 
-  return likeCount.count;
+  return likeCount;
 };
 /**
  * @method likeCommentService
@@ -632,7 +636,7 @@ export const getCommentLikesCount = async commentId => {
  * @param {string} reaction - the reaction value -like or dislike
  */
 
-export const likeCommentService = async (slug, commentId, userId) => {
+export const likeCommentService = async (slug, commentId, userId, email) => {
   try {
     const articleExist = await Article.findOne({ where: { slug } });
 
@@ -656,7 +660,8 @@ export const likeCommentService = async (slug, commentId, userId) => {
     if (!findReaction) {
       await CommentReaction.create({
         userId,
-        commentId
+        commentId,
+        email
       });
 
       const likeCount = await getCommentLikesCount(commentId);

src/services/auth.service.js

@@ -87,13 +87,14 @@ export const loginService = async body => {
     return bcrypt.compareSync(plainText, result.password);
   };
   if (result && validatePassword(password)) {
-    const { firstName, lastName } = result;
+    const { firstName, lastName, image } = result;
     const token = await getToken(result);
     const user = {
       firstName,
       lastName,
       email: result.email,
-      token
+      token,
+      image
     };
     return { user };
   }