Merge pull request #126 from game-node-app/dev

Fixes and improvements in the new deep nested comments sytem
game-node-app · Dec 4, 2024 · 3936465 · 3936465
2 parents 8ff49b8 + b12ef6d
commit 3936465
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 12 deletions.
diff --git a/server_swagger.json b/server_swagger.json
diff --git a/src/comment/comment.controller.ts b/src/comment/comment.controller.ts
@@ -43,7 +43,8 @@ export class CommentController {
     @HttpCode(HttpStatus.OK)
     @UseInterceptors(PaginationInterceptor)
     async findAll(@Body() dto: FindAllCommentsDto) {
-        return this.commentService.findAll(dto);
+        const result = await this.commentService.findAll(dto);
+        return result;
     }
 
     @Get(":sourceType/:id")

diff --git a/src/comment/comment.service.ts b/src/comment/comment.service.ts
@@ -61,7 +61,7 @@ export class CommentService {
                     },
                     relations: {
                         // Includes comments of comments in a list in each element
-                        childOf: true,
+                        parentOf: true,
                     },
                 });
             case CommentSourceType.ACTIVITY:
@@ -74,7 +74,7 @@ export class CommentService {
                     },
                     relations: {
                         // Includes comments of comments in a list in each element
-                        childOf: true,
+                        parentOf: true,
                     },
                 });
             default:

diff --git a/src/comment/comment.types.ts b/src/comment/comment.types.ts
@@ -6,6 +6,6 @@ import { UserComment } from "./entity/user-comment.entity";
  * Only one level of "children" is allowed for performance reasons.
  */
 export interface ThreadEnabledComment<T extends UserComment> {
-    childOf: T | null;
+    childOf: T[] | null;
     childOfId: string | null;
 }
diff --git a/src/comment/dto/find-comments-paginated-response.dto.ts b/src/comment/dto/find-comments-paginated-response.dto.ts
@@ -4,8 +4,16 @@ import {
 } from "../../utils/pagination/pagination-response.dto";
 import { ReviewComment } from "../entity/review-comment.entity";
 import { ActivityComment } from "../entity/activity-comment.entity";
+import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
 
 export class FindCommentsPaginatedResponseDto extends PaginationResponseDto {
+    @ApiProperty({
+        type: "array",
+        oneOf: [
+            { $ref: getSchemaPath(ReviewComment) },
+            { $ref: getSchemaPath(ActivityComment) },
+        ],
+    })
     data: ReviewComment[] | ActivityComment[] = [];
     pagination: PaginationInfo = new PaginationInfo();
 }
diff --git a/src/comment/entity/activity-comment.entity.ts b/src/comment/entity/activity-comment.entity.ts
@@ -1,11 +1,14 @@
 import { UserComment } from "./user-comment.entity";
-import { Column, Entity, Index, ManyToOne } from "typeorm";
+import { Column, Entity, Index, ManyToOne, OneToMany } from "typeorm";
 import { Activity } from "../../activities/activities-repository/entities/activity.entity";
-import { ReviewComment } from "./review-comment.entity";
+import { ThreadEnabledComment } from "../comment.types";
 
 @Entity()
 @Index(["profile", "activity"])
-export class ActivityComment extends UserComment {
+export class ActivityComment
+    extends UserComment
+    implements ThreadEnabledComment<ActivityComment>
+{
     @ManyToOne(() => Activity, {
         nullable: false,
         onDelete: "CASCADE",
@@ -16,11 +19,14 @@ export class ActivityComment extends UserComment {
     })
     activityId: string;
 
-    @ManyToOne(() => ReviewComment, {
+    @OneToMany(() => ActivityComment, (comment) => comment.childOf)
+    parentOf: ActivityComment[] | null;
+
+    @ManyToOne(() => ActivityComment, {
         nullable: true,
         onDelete: "CASCADE",
     })
-    childOf: ReviewComment | null;
+    childOf: ActivityComment[] | null;
     @Column({
         nullable: true,
     })

diff --git a/src/comment/entity/review-comment.entity.ts b/src/comment/entity/review-comment.entity.ts
@@ -1,5 +1,5 @@
 import { UserComment } from "./user-comment.entity";
-import { Column, Entity, Index, ManyToOne } from "typeorm";
+import { Column, Entity, Index, ManyToOne, OneToMany } from "typeorm";
 import { Review } from "../../reviews/entities/review.entity";
 import { ThreadEnabledComment } from "../comment.types";
 
@@ -19,11 +19,14 @@ export class ReviewComment
     })
     reviewId: string;
 
+    @OneToMany(() => ReviewComment, (comment) => comment.childOf)
+    parentOf: ReviewComment[] | null;
+
     @ManyToOne(() => ReviewComment, {
         nullable: true,
         onDelete: "CASCADE",
     })
-    childOf: ReviewComment | null;
+    childOf: ReviewComment[] | null;
     @Column({
         nullable: true,
     })