feat: 댓글에 대한 비밀 대댓글을 댓글 작성자가 볼 수 있도록 변경

src/main/java/com/mallang/comment/domain/AuthComment.java

@@ -43,6 +43,19 @@ public void write(@Nullable String postPassword) {
         post.validateAccess(writer, postPassword);
     }
 
+    public boolean canSee(Member member) {
+        if (!secret) {
+            return true;
+        }
+        if (post.isWriter(member)) {
+            return true;
+        }
+        if (writer.equals(member)) {
+            return true;
+        }
+        return parent != null && parent instanceof AuthComment authed && authed.getWriter().equals(member);
+    }
+
     public void validateUpdate(Member member, @Nullable String postPassword) {
         post.validateAccess(member, postPassword);
         if (member.equals(writer)) {

src/main/java/com/mallang/comment/query/CommentQueryService.java

@@ -2,13 +2,18 @@
 
 import com.mallang.auth.domain.Member;
 import com.mallang.auth.query.repository.MemberQueryRepository;
+import com.mallang.comment.domain.AuthComment;
+import com.mallang.comment.domain.Comment;
+import com.mallang.comment.domain.UnAuthComment;
 import com.mallang.comment.query.repository.CommentQueryRepository;
+import com.mallang.comment.query.response.AuthCommentResponse;
 import com.mallang.comment.query.response.CommentResponse;
+import com.mallang.comment.query.response.UnAuthCommentResponse;
 import com.mallang.post.domain.Post;
 import com.mallang.post.query.repository.PostQueryRepository;
 import jakarta.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +26,6 @@ public class CommentQueryService {
     private final PostQueryRepository postQueryRepository;
     private final MemberQueryRepository memberQueryRepository;
     private final CommentQueryRepository commentQueryRepository;
-    private final CommentDataPostProcessor commentDataPostProcessor;
 
     public List<CommentResponse> findAllByPost(
             Long postId,
@@ -32,14 +36,34 @@ public List<CommentResponse> findAllByPost(
         Post post = postQueryRepository.getById(postId, blogName);
         Member member = memberQueryRepository.getMemberIfIdNotNull(memberId);
         post.validateAccess(member, postPassword);
-        List<CommentResponse> result = commentQueryRepository.findAllByPost(postId, blogName)
+        List<Comment> parents = commentQueryRepository.findAllByPost(postId, blogName)
                 .stream()
-                .filter(it -> Objects.isNull(it.getParent()))
-                .map(CommentResponse::from)
+                .filter(it -> it.getParent() == null)
                 .toList();
-        if (post.getWriter().equals(member)) {
-            return result;
+        List<CommentResponse> responses = new ArrayList<>();
+        for (Comment parent : parents) {
+            List<Comment> children = parent.getChildren();
+            CommentResponse parentResponse = mapToResponse(parent, member);
+            parentResponse.setChildren(mapToResponses(children, member));
+            responses.add(parentResponse);
         }
-        return commentDataPostProcessor.processSecret(result, memberId);
+        return responses;
+    }
+
+    private List<CommentResponse> mapToResponses(List<Comment> comments, Member member) {
+        return comments.stream()
+                .map(it -> mapToResponse(it, member))
+                .toList();
+    }
+
+    private CommentResponse mapToResponse(Comment comment, Member member) {
+        if (comment instanceof AuthComment authComment) {
+            if (authComment.canSee(member)) {
+                return AuthCommentResponse.from(authComment);
+            }
+            return AuthCommentResponse.protectFrom(authComment);
+        }
+        return UnAuthCommentResponse.from((UnAuthComment) comment);
+
     }
 }

src/main/java/com/mallang/comment/query/response/AuthCommentResponse.java

@@ -1,9 +1,10 @@
 package com.mallang.comment.query.response;
 
+import static com.mallang.comment.query.response.AuthCommentResponse.WriterResponse.ANONYMOUS;
+
 import com.mallang.auth.domain.Member;
 import com.mallang.comment.domain.AuthComment;
 import java.time.LocalDateTime;
-import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -21,10 +22,9 @@ public AuthCommentResponse(
             LocalDateTime createdDate,
             boolean deleted,
             WriterResponse writer,
-            boolean secret,
-            List<CommentResponse> children
+            boolean secret
     ) {
-        super(id, content, createdDate, deleted, children);
+        super(id, content, createdDate, deleted);
         this.writer = writer;
         this.secret = secret;
     }
@@ -35,14 +35,22 @@ public static AuthCommentResponse from(AuthComment comment) {
                 .content(comment.getContent())
                 .createdDate(comment.getCreatedDate())
                 .deleted(comment.isDeleted())
-                .children(comment.getChildren().stream()
-                        .map(CommentResponse::from)
-                        .toList())
                 .writer(WriterResponse.from(comment.getWriter()))
                 .secret(comment.isSecret())
                 .build();
     }
 
+    public static AuthCommentResponse protectFrom(AuthComment comment) {
+        return AuthCommentResponse.builder()
+                .id(comment.getId())
+                .content("비밀 댓글입니다.")
+                .createdDate(comment.getCreatedDate())
+                .deleted(comment.isDeleted())
+                .writer(ANONYMOUS)
+                .secret(true)
+                .build();
+    }
+
     public record WriterResponse(
             Long memberId,
             String nickname,

src/main/java/com/mallang/comment/query/response/CommentResponse.java

@@ -5,10 +5,6 @@
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.mallang.comment.domain.AuthComment;
-import com.mallang.comment.domain.Comment;
-import com.mallang.comment.domain.UnAuthComment;
-import com.mallang.common.execption.MallangLogException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,29 +30,22 @@ public abstract sealed class CommentResponse
     protected final String content;
     protected final LocalDateTime createdDate;
     protected final boolean deleted;
-    protected final List<CommentResponse> children;
+    protected final List<CommentResponse> children = new ArrayList<>();
 
     protected CommentResponse(
             Long id,
             String content,
             LocalDateTime createdDate,
-            boolean deleted,
-            List<CommentResponse> children
+            boolean deleted
     ) {
         this.id = id;
         this.content = content;
         this.createdDate = createdDate;
         this.deleted = deleted;
-        this.children = (children == null)
-                ? new ArrayList<>()
-                : children;
     }
 
-    public static CommentResponse from(Comment comment) {
-        return switch (comment) {
-            case AuthComment authComment -> AuthCommentResponse.from(authComment);
-            case UnAuthComment unAuthComment -> UnAuthCommentResponse.from(unAuthComment);
-            default -> throw new MallangLogException("해당 Comment 타입이 CommentResponse 에서 지원되지 않습니다.");
-        };
+    public void setChildren(List<CommentResponse> children) {
+        this.children.clear();
+        this.children.addAll(children);
     }
 }

src/main/java/com/mallang/comment/query/response/UnAuthCommentResponse.java

@@ -2,7 +2,6 @@
 
 import com.mallang.comment.domain.UnAuthComment;
 import java.time.LocalDateTime;
-import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -18,10 +17,9 @@ public UnAuthCommentResponse(
             String content,
             LocalDateTime createdDate,
             boolean deleted,
-            WriterResponse writer,
-            List<CommentResponse> children
+            WriterResponse writer
     ) {
-        super(id, content, createdDate, deleted, children);
+        super(id, content, createdDate, deleted);
         this.writer = writer;
     }
 
@@ -31,9 +29,6 @@ public static UnAuthCommentResponse from(UnAuthComment comment) {
                 .content(comment.getContent())
                 .createdDate(comment.getCreatedDate())
                 .deleted(comment.isDeleted())
-                .children(comment.getChildren().stream()
-                        .map(CommentResponse::from)
-                        .toList())
                 .writer(new WriterResponse(comment.getNickname()))
                 .build();
     }