fix comment/replies support

wanderer-moe · Mar 18, 2024 · 32e0c55 · 32e0c55
1 parent e9b8c1c
commit 32e0c55
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 deletions.
diff --git a/src/scripts/seed/seed.ts b/src/scripts/seed/seed.ts
@@ -443,6 +443,30 @@ async function main() {
         `[SEED] [assetComments] inserted ${newAssetCommentsReplies.length} rows\n`
     )
 
+    const newAssetCommentsRepliesReplies = await db
+        .insert(assetComments)
+        .values([
+            {
+                commentedById: newUsers[0].id,
+                comment: "test comment reply reply",
+                parentCommentId: newAssetCommentsReplies[0].id,
+            },
+            {
+                commentedById: newUsers[1].id,
+                comment: "test comment reply reply 2",
+                parentCommentId: newAssetCommentsReplies[1].id,
+            },
+            {
+                commentedById: newUsers[0].id,
+                comment: "test comment reply reply 3",
+                parentCommentId: newAssetCommentsReplies[2].id,
+            },
+        ])
+        .returning()
+    console.log(
+        `[SEED] [assetComments] inserted ${newAssetCommentsRepliesReplies.length} rows\n`
+    )
+
     console.log("[SEED] [assetCommentsLikes] Seeding asset comments likes...")
     const newAssetCommentsLikes = await db
         .insert(assetCommentsLikes)
@@ -471,6 +495,18 @@ async function main() {
                 commentId: newAssetCommentsReplies[2].id,
                 likedById: newUsers[0].id,
             },
+            {
+                commentId: newAssetCommentsRepliesReplies[0].id,
+                likedById: newUsers[1].id,
+            },
+            {
+                commentId: newAssetCommentsRepliesReplies[1].id,
+                likedById: newUsers[0].id,
+            },
+            {
+                commentId: newAssetCommentsRepliesReplies[2].id,
+                likedById: newUsers[1].id,
+            },
         ])
         .returning()
     console.log(

diff --git a/src/v2/routes/asset/get-asset-comments.ts b/src/v2/routes/asset/get-asset-comments.ts
@@ -44,6 +44,7 @@ const getAssetCommentsResponseSchema = z.object({
                 createdAt: true,
             })
             .extend({
+                hasReplies: z.boolean(),
                 likes: z.number(),
             })
     ),
@@ -86,6 +87,7 @@ export const ViewAssetCommentsRoute = (handler: AppHandler) => {
                 commentedById: assetComments.commentedById,
                 comment: assetComments.comment,
                 createdAt: assetComments.createdAt,
+                hasReplies: sql`EXISTS (SELECT 1 FROM assetComments AS ac WHERE ac.parent_comment_id = ${assetComments.id})`,
                 likes: sql`COUNT(${assetCommentsLikes.commentId})`,
             })
             .from(assetComments)
@@ -102,7 +104,10 @@ export const ViewAssetCommentsRoute = (handler: AppHandler) => {
         return ctx.json(
             {
                 success: true,
-                comments,
+                comments: comments.map((c) => ({
+                    ...c,
+                    hasReplies: !!c.hasReplies,
+                })),
             },
             200
         )

diff --git a/src/v2/routes/asset/get-comment-replies.ts b/src/v2/routes/asset/get-comment-replies.ts
@@ -53,7 +53,7 @@ const getCommentRepliesResponseSchema = z.object({
 const getCommentsRepliesRoute = createRoute({
     path: "/comment/{id}/replies",
     method: "get",
-    summary: "Get a comment's replies.",
+    summary: "Get a comment's replies",
     description: "Get a comment's replies.",
     tags: ["Asset"],
     request: {
@@ -87,7 +87,7 @@ export const GetCommentsRepliesRoute = (handler: AppHandler) => {
                 commentedById: assetComments.commentedById,
                 comment: assetComments.comment,
                 createdAt: assetComments.createdAt,
-                hasReplies: sql<number>`EXISTS (SELECT 1 FROM ${assetComments} WHERE ${assetComments.parentCommentId} = ${assetComments.id})`,
+                hasReplies: sql`EXISTS (SELECT 1 FROM assetComments AS ac WHERE ac.parent_comment_id = ${assetComments.id})`,
                 likes: sql`COUNT(${assetCommentsLikes.commentId})`,
             })
             .from(assetComments)