Merge pull request #112 from modern-agile-team/feature/comment

Refactor(2swo/Server) 엔티티 onDelete설정
modern-agile-team · Nov 10, 2023 · 571fe2d · 571fe2d
2 parents 6a5ca89 + 2e19e08
commit 571fe2d
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 24 deletions.
diff --git a/src/boards/entities/board-image.entity.ts b/src/boards/entities/board-image.entity.ts
@@ -12,7 +12,9 @@ export class BoardImage {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @ManyToOne(() => Board, (board) => board.boardImages)
+  @ManyToOne(() => Board, (board) => board.boardImages, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'board_id' })
   board: Board;
 

diff --git a/src/boards/entities/board.entity.ts b/src/boards/entities/board.entity.ts
@@ -24,26 +24,22 @@ export class Board {
   @Column({ name: 'user_id' })
   userId: number;
 
-  @ManyToOne(() => User, (user) => user.board)
+  @ManyToOne(() => User, (user) => user.board, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'user_id' })
   user: User;
 
-  @OneToMany(() => BoardImage, (boardImages) => boardImages.board, {
-    onDelete: 'CASCADE',
-  })
+
+  @OneToMany(() => BoardImage, (boardImage) => boardImage.board)
   boardImages: BoardImage[];
 
-  @OneToMany(() => BoardLike, (boardLike) => boardLike.boardId, {
-    onDelete: 'CASCADE',
-  })
+  @OneToMany(() => BoardLike, (boardLike) => boardLike.boardId)
   boardLike: BoardLike;
 
   @OneToMany(
     () => BoardNotification,
     (BoardNotification) => BoardNotification.board,
-    {
-      onDelete: 'CASCADE',
-    },
   )
   boardNotification: BoardNotification;
 

diff --git a/src/comments/entities/comment-like.entity.ts b/src/comments/entities/comment-like.entity.ts
@@ -8,15 +8,21 @@ export class CommentLike {
   @PrimaryGeneratedColumn()
   id: string;
 
-  @ManyToOne(() => User)
+  @ManyToOne(() => User, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'user_id' })
   userId: User;
 
-  @ManyToOne(() => Comment)
+  @ManyToOne(() => Comment, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'comment_id' })
   commentId: Comment;
 
-  @ManyToOne(() => ReComment)
+  @ManyToOne(() => ReComment, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'recomment_id' })
   recommentId: ReComment;
 }
diff --git a/src/comments/entities/comment.entity.ts b/src/comments/entities/comment.entity.ts
@@ -18,19 +18,21 @@ export class Comment {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @ManyToOne(() => User)
+  @ManyToOne(() => User, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'user_id' })
   user: User;
 
   @Column({ name: 'user_id' })
   userId: number;
 
-  @OneToMany(() => ReComment, (reComment) => reComment.comment, {
-    onDelete: 'CASCADE',
-  })
+  @OneToMany(() => ReComment, (reComment) => reComment.comment)
   reComment: ReComment[];
 
-  @ManyToOne(() => Board)
+  @ManyToOne(() => Board, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'board_id' })
   board: Board;
 

diff --git a/src/comments/entities/recomment.entity.ts b/src/comments/entities/recomment.entity.ts
@@ -16,14 +16,18 @@ export class ReComment {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @ManyToOne(() => User)
+  @ManyToOne(() => User, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'user_id' })
   user: User;
 
   @Column({ name: 'user_id' })
   userId: number;
 
-  @ManyToOne(() => Comment, (comment) => comment.reComment)
+  @ManyToOne(() => Comment, (comment) => comment.reComment, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'comment_id' })
   comment: Comment;
 

diff --git a/src/common/notice/entities/board-notice.entity.ts b/src/common/notice/entities/board-notice.entity.ts
@@ -24,21 +24,25 @@ export class BoardNotification {
   @Column({ name: 'board_id' })
   boardId: number;
 
-  @ManyToOne(() => Board, (board) => board.boardNotification)
+  @ManyToOne(() => Board, (board) => board.boardNotification, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'board_id' })
   board: Board;
 
   @Column({ name: 'sender_id' })
   senderId: number;
 
-  @ManyToOne(() => User)
+  @ManyToOne(() => User, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'sender_id' })
   sender: User;
 
   @Column({ name: 'receiver_id' })
   receiverId: number;
 
-  @ManyToOne(() => User)
+  @ManyToOne(() => User, { onDelete: 'CASCADE' })
   @JoinColumn({ name: 'receiver_id' })
   receiver: User;