Merge pull request #208 from ChetanSaini12/chetan

Chetan
ChetanSaini12 · Jul 1, 2024 · aa4eeff · aa4eeff
2 parents 53d8f74 + c98e3d2
commit aa4eeff
Show file tree

Hide file tree

Showing 17 changed files with 201 additions and 46 deletions.
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 {
     /*
@@ -21,7 +22,8 @@ export const addCommentExp = async (_, payload, context) => {
           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 {
@@ -32,7 +33,7 @@ export const likeExpComment = async (_, payload, context) => {
       if (voteEntry) {
         await prisma.userVotes.delete({
           where: {
-            id: voteEntry.id
+            id: voteEntry.id,
           },
         })
         let likedComment = await prisma.expComment.update({
@@ -44,8 +45,23 @@ 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({
@@ -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,7 +115,7 @@ export const likeExpComment = async (_, payload, context) => {
     ) {
       throw error
     }
-    console.log("Error while liking comment : ", 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 {
@@ -42,7 +43,8 @@ export const likeExpCommentReply = async (_, payload, context) => {
             },
           },
         })
-        likedReply = addUserName(likedReply)
+        likedReply = await addLikeStatus(likedReply, context.userId, 'EXP_REPLY')
+        likedReply = await addUserName(likedReply)
         return likedReply
       }
 
@@ -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 {

diff --git a/backend/src/controllers/Experience/formatExp.js b/backend/src/controllers/Experience/formatExp.js
@@ -0,0 +1,35 @@
+import { GraphQLError } from "graphql"
+import { addLikeStatus } from "../../utils/addLikeStatus.js"
+import { addUserName } from "./Comment/addUserName.js"
+import { addNameExp } from "./addnameExp.js"
+
+export const formatExp = async (experience, context) => {
+    try {
+
+      experience = await addLikeStatus(experience, context.userId, 'EXPERIENCE')
+      experience = await addNameExp(experience)
+      console.log('The length of exp.comments : ', experience)
+      for (let i = 0; i < experience.comments?.length; i++) {
+        experience.comments[i] = await addLikeStatus(
+          experience.comments[i],
+          context.userId,
+          'EXP_COMMENT'
+        )
+        experience.comments[i] = await addUserName(experience.comments[i])
+        for (let j = 0; j < experience.comments[i]?.reply?.length; j++) {
+          experience.comments[i].reply[j] = await addLikeStatus(
+            experience.comments[i].reply[j],
+            context.userId,
+            'EXP_REPLY'
+          )
+          experience.comments[i].reply[j] = await addUserName(
+            experience.comments[i].reply[j]
+          )
+        }
+      }
+      return experience
+    } catch (error) {
+        console.log('ERROR WHILE FORMATTING EXP : ', error)
+        throw new GraphQLError('Something went wrong')
+    }
+}
diff --git a/backend/src/controllers/Experience/getExperienceById.js b/backend/src/controllers/Experience/getExperienceById.js
@@ -2,8 +2,10 @@ import { GraphQLError } from 'graphql'
 import { prisma } from '../../../prisma/index.js'
 import { addNameExp } from './addnameExp.js'
 import { addUserName } from './Comment/addUserName.js'
+import { addLikeStatus } from '../../utils/addLikeStatus.js'
+import { formatExp } from './formatExp.js'
 
-export const getExperienceById = async (_, payload) => {
+export const getExperienceById = async (_, payload, context) => {
   try {
     /*
             payload : {experienceId}
@@ -14,23 +16,16 @@ export const getExperienceById = async (_, payload) => {
       },
       include: {
         comments: {
-          include : {
-            reply : true
-          }
-        }
+          include: {
+            reply: true,
+          },
+        },
       },
     })
-    experience = await addNameExp(experience)
-    console.log('The length of exp.comments : ', experience);
-    for (let i = 0; i < experience.comments?.length; i++) {
-      experience.comments[i] = await addUserName(experience.comments[i])
-      for(let j = 0; j < experience.comments[i]?.reply?.length; j++) {
-        experience.comments[i].reply[j] = await addUserName(experience.comments[i].reply[j])
-      }
-    }
+    experience = await formatExp(experience, context)
     return experience
   } catch (error) {
-    console.log('Error while getting experience by id : ', error);
+    console.log('Error while getting experience by id : ', error)
     throw new GraphQLError('Something went wrong!!')
   }
 }
diff --git a/backend/src/controllers/Experience/updateExperience.js b/backend/src/controllers/Experience/updateExperience.js
@@ -29,7 +29,8 @@ export const updateExperience = async (_, payload, context) => {
             comments : true
           }
         })
-        updatedExp = addNameExp(updatedExp)
+        updatedExp = await addLikeStatus(updatedExp, context.userId, 'EXPERIENCE')
+        updatedExp = await addNameExp(updatedExp)
         return updatedExp
       } else {
         throw new GraphQLError(

diff --git a/backend/src/controllers/Experience/upvoteExperience.js b/backend/src/controllers/Experience/upvoteExperience.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 upvoteExperience = async (_, payload, context) => {
   try {
@@ -19,8 +22,15 @@ export const upvoteExperience = async (_, payload, context) => {
           let experience = await prisma.experience.update({
             where: { id: payload.id },
             data: { upvotes: { decrement: 1 } },
+            include: {
+              comments: {
+                include: {
+                  reply: true,
+                },
+              },
+            },
           })
-          experience = addNameExp(experience)
+          experience = await formatExp(experience, context)
           return experience
         } else {
           await prisma.userVotes.update({
@@ -30,6 +40,7 @@ export const upvoteExperience = async (_, payload, context) => {
             data: {
               type: 'LIKE',
             },
+
           })
           let experience = await prisma.experience.update({
             where: {
@@ -44,10 +55,14 @@ export const upvoteExperience = async (_, payload, context) => {
               },
             },
             include: {
-              comments: true,
+              comments: {
+                include : {
+                  reply : true
+                }
+              }
             },
           })
-          experience = addNameExp(experience)
+          experience = await formatExp(experience, context)
           return experience
         }
       } else {
@@ -69,10 +84,14 @@ export const upvoteExperience = async (_, payload, context) => {
             },
           },
           include: {
-            comments: true,
+            comments: {
+              include : {
+                reply : true
+              }
+            }
           },
         })
-        experience = addNameExp(experience)
+        experience = await formatExp(experience, context)
         return experience
       }
     } else {
@@ -91,6 +110,7 @@ export const upvoteExperience = async (_, payload, context) => {
     ) {
       throw error
     }
+    console.log("ERROR WHILE UPVOTING EXPERIENCE : ", error)
     throw new GraphQLError('Something went wrong!!')
   }
 }