Merge pull request #471 from Team-0ops/develop

Develop

Author: llokr1

src/main/java/Oops/backend/domain/comment/entity/Comment.java

@@ -3,6 +3,7 @@
 import Oops.backend.domain.common.BaseEntity;
 import Oops.backend.domain.post.entity.Post;
 import Oops.backend.domain.user.entity.User;
+import Oops.backend.domain.commentReport.entity.CommentReport;
 import jakarta.persistence.*;
 import lombok.*;
 import org.yaml.snakeyaml.comments.CommentType;
@@ -42,6 +43,12 @@ public class Comment extends BaseEntity {
     @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL)
     private List<Comment> replyComments;
 
+    @OneToMany(mappedBy = "comment", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<CommentLike> commentLikes;
+
+    @OneToMany(mappedBy = "comment", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<CommentReport> commentReports;
+
     @Builder
     private Comment(Post post, User user, String content){
 
@@ -50,6 +57,8 @@ private Comment(Post post, User user, String content){
         this.user = user;
         this.content = content;
         this.replyComments = new ArrayList<>();
+        this.commentLikes = new ArrayList<>();
+        this.commentReports = new ArrayList<>();
 
     }
 

src/main/java/Oops/backend/domain/commentReport/entity/CommentReport.java

@@ -15,7 +15,7 @@ public class CommentReport extends BaseEntity{
     @JoinColumn(name = "reporter")
     private User reportUser;
 
-    @OneToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "target")
     private Comment comment;
 

src/main/java/Oops/backend/domain/post/service/PostCommandServiceImpl.java

@@ -95,13 +95,16 @@ public void deletePost(Long postId, User user) {
         postsOfPostGroup.remove(post);
         post.setPostGroup(null);
 
+        if (postsOfPostGroup.isEmpty()){
+            postGroupCommandService.deletePostGroup(postGroup);
+        }
+
         // Lesson과의 연관 관계 제거
         List<Lesson> lessons = lessonQueryService.findLessonsByPost(post);
         lessons.forEach((lesson) -> lesson.setPost(null));
 
-        if (postsOfPostGroup.isEmpty()){
-            postGroupCommandService.deletePostGroup(postGroup);
-        }
+        // Post 엔티티의 cascade 설정으로 Comment가 자동 삭제되고,
+        // Comment 엔티티의 cascade 설정으로 CommentLike와 CommentReport도 자동 삭제됨
 
         postRepository.delete(post);