Merge pull request #209 from ChetanSaini12/main

Experience Page
ChetanSaini12 · Jul 1, 2024 · 36a38b1 · 36a38b1
2 parents 29ecd44 + aa4eeff
commit 36a38b1
Show file tree

Hide file tree

Showing 23 changed files with 823 additions and 418 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@apollo/server": "^4.10.0",
     "@graphql-tools/merge": "^9.0.4",
-    "@prisma/client": "^5.9.1",
+    "@prisma/client": "^5.16.1",
     "all": "^0.0.0",
     "bcryptjs": "^2.4.3",
     "cloudinary": "^2.2.0",
@@ -36,6 +36,6 @@
   "devDependencies": {
     "nodemon": "^3.0.3",
     "prettier": "^3.2.4",
-    "prisma": "^5.8.1"
+    "prisma": "^5.16.1"
   }
 }
diff --git a/backend/src/controllers/Experience/Comment/addCommentExp.js b/backend/src/controllers/Experience/Comment/addCommentExp.js
@@ -1,6 +1,7 @@
 import { prisma } from '../../../../prisma/index.js'
 import { GraphQLError } from 'graphql'
 import { addUserName } from './addUserName.js'
+import { addLikeStatus } from '../../../utils/addLikeStatus.js'
 export const addCommentExp = async (_, payload, context) => {
   try {
     /*
@@ -17,8 +18,12 @@ export const addCommentExp = async (_, payload, context) => {
           experienceId: payload.Comment.experienceId,
           commentorId: context.userId,
         },
+        include : {
+          reply : true
+        }
       })
-      expComment = addUserName(expComment)
+      expComment = await addLikeStatus(expComment, context.userId, 'EXP_COMMENT')
+      expComment = await addUserName(expComment)
       return expComment
     } else {
       throw new GraphQLError('User is not authorised', {

diff --git a/backend/src/controllers/Experience/Comment/addReplyToExpComment.js b/backend/src/controllers/Experience/Comment/addReplyToExpComment.js
@@ -1,6 +1,7 @@
 import { GraphQLError } from 'graphql'
 import { prisma } from '../../../../prisma/index.js'
 import { addUserName } from './addUserName.js'
+import { addLikeStatus } from '../../../utils/addLikeStatus.js'
 
 export const addReplyToExpComment = async (_, payload, context) => {
   try {
@@ -32,7 +33,8 @@ export const addReplyToExpComment = async (_, payload, context) => {
           replierId: context.userId,
         },
       })
-      expReply = addUserName(expReply)
+      expReply = await addLikeStatus(expReply, context.userId, 'EXP_REPLY')
+      expReply = await addUserName(expReply)
       return expReply
     } else {
       throw new GraphQLError('User is not authorised', {

diff --git a/backend/src/controllers/Experience/Comment/likeExpComment.js b/backend/src/controllers/Experience/Comment/likeExpComment.js
@@ -1,6 +1,7 @@
 import { GraphQLError } from 'graphql'
 import { prisma } from '../../../../prisma/index.js'
 import { addUserName } from './addUserName.js'
+import { addLikeStatus } from '../../../utils/addLikeStatus.js'
 
 export const likeExpComment = async (_, payload, context) => {
   try {
@@ -25,14 +26,14 @@ export const likeExpComment = async (_, payload, context) => {
       const voteEntry = await prisma.userVotes.findFirst({
         where: {
           userId: context.userId,
-          area: 'COMMENT',
+          area: 'EXP_COMMENT',
           areaId: payload.commentId,
         },
       })
       if (voteEntry) {
         await prisma.userVotes.delete({
           where: {
-            id: voteEntry.id
+            id: voteEntry.id,
           },
         })
         let likedComment = await prisma.expComment.update({
@@ -44,14 +45,29 @@ export const likeExpComment = async (_, payload, context) => {
               decrement: 1,
             },
           },
+          include: {
+            reply: true,
+          },
         })
-        likedComment = addUserName(likedComment)
+        likedComment = await addLikeStatus(
+          likedComment,
+          context.userId,
+          'EXP_COMMENT'
+        )
+        likedComment = await addUserName(likedComment)
+        for (let i = 0; i < likedComment.reply.length; i++) {
+          likedComment.reply[i] = await addLikeStatus(
+            likedComment.reply[i],
+            context.userId,
+            'EXP_REPLY'
+          )
+        }
         return likedComment
       }
       await prisma.userVotes.create({
         data: {
           userId: context.userId,
-          area: 'COMMENT',
+          area: 'EXP_COMMENT',
           areaId: payload.commentId,
           type: 'LIKE',
         },
@@ -65,8 +81,23 @@ export const likeExpComment = async (_, payload, context) => {
             increment: 1,
           },
         },
+        include: {
+          reply: true,
+        },
       })
-      likedComment = addUserName(likedComment)
+      likedComment = await addLikeStatus(
+        likedComment,
+        context.userId,
+        'EXP_COMMENT'
+      )
+      likedComment = await addUserName(likedComment)
+      for (let i = 0; i < likedComment.reply.length; i++) {
+        likedComment.reply[i] = await addLikeStatus(
+          likedComment.reply[i],
+          context.userId,
+          'EXP_REPLY'
+        )
+      }
       return likedComment
     } else {
       throw new GraphQLError('You are not authorised user!!', {
@@ -84,6 +115,7 @@ export const likeExpComment = async (_, payload, context) => {
     ) {
       throw error
     }
+    console.log('Error while liking comment : ', error)
     throw new GraphQLError('Something went wrong!!')
   }
 }
diff --git a/backend/src/controllers/Experience/Comment/likeExpCommentReply.js b/backend/src/controllers/Experience/Comment/likeExpCommentReply.js
@@ -1,6 +1,7 @@
 import { GraphQLError } from 'graphql'
 import { prisma } from '../../../../prisma/index.js'
 import { addUserName } from './addUserName.js'
+import { addLikeStatus } from '../../../utils/addLikeStatus.js'
 
 export const likeExpCommentReply = async (_, payload, context) => {
   try {
@@ -26,7 +27,7 @@ export const likeExpCommentReply = async (_, payload, context) => {
       const voteEntry = await prisma.userVotes.findFirst({
         where: {
           userId: context.userId,
-          area: 'REPLY',
+          area: 'EXP_REPLY',
           areaId: replyId,
         },
       })
@@ -42,14 +43,15 @@ export const likeExpCommentReply = async (_, payload, context) => {
             },
           },
         })
-        likedReply = addUserName(likedReply)
+        likedReply = await addLikeStatus(likedReply, context.userId, 'EXP_REPLY')
+        likedReply = await addUserName(likedReply)
         return likedReply
       }
 
       await prisma.userVotes.create({
         data: {
           userId: context.userId,
-          area: 'REPLY',
+          area: 'EXP_REPLY',
           areaId: replyId,
           type: 'LIKE',
         },
@@ -65,7 +67,8 @@ export const likeExpCommentReply = async (_, payload, context) => {
           },
         },
       })
-      likedReply = addUserName(likedReply)
+      likedReply = await addLikeStatus(likedReply, context.userId, 'EXP_REPLY')
+      likedReply = await addUserName(likedReply)
       return likedReply
     } else {
       throw new GraphQLError('You are not authorised user!!', {

diff --git a/backend/src/controllers/Experience/downvoteExperience.js b/backend/src/controllers/Experience/downvoteExperience.js
@@ -1,6 +1,9 @@
 import { GraphQLError } from 'graphql'
 import { prisma } from '../../../prisma/index.js'
 import { addNameExp } from './addnameExp.js'
+import { addLikeStatus } from '../../utils/addLikeStatus.js'
+import { addUserName } from './Comment/addUserName.js'
+import { formatExp } from './formatExp.js'
 
 export const downvoteExperience = async (_, payload, context) => {
   try {
@@ -26,10 +29,14 @@ export const downvoteExperience = async (_, payload, context) => {
               },
             },
             include: {
-              comments: true,
+              comments: {
+                include: {
+                  reply: true,
+                },
+              },
             },
           })
-          experience = addNameExp(experience)
+          experience = await formatExp(experience, context)
           return experience
         } else {
           await prisma.userVotes.update({
@@ -53,10 +60,14 @@ export const downvoteExperience = async (_, payload, context) => {
               },
             },
             include: {
-              comments: true,
+              comments: {
+                include: {
+                  reply: true,
+                },
+              },
             },
           })
-          experience = addNameExp(experience)
+          experience = await formatExp(experience, context)
           return experience
         }
       } else {
@@ -78,10 +89,14 @@ export const downvoteExperience = async (_, payload, context) => {
             },
           },
           include: {
-            comments: true,
+            comments: {
+              include: {
+                reply: true,
+              },
+            },
           },
         })
-        experience = addNameExp(experience)
+        experience = await formatExp(experience, context)
         return experience
       }
     } else {