Merge pull request #111 from Leets-Official/refactor#105

Refactor#111 글 조회시 포지션과 역할 같이 반환하도록 수정
Leets-Official · Jan 18, 2025 · da91da2 · da91da2
2 parents a480acb + 8712a3e
commit da91da2
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 76 deletions.
diff --git a/src/main/java/leets/weeth/domain/board/application/dto/NoticeDTO.java b/src/main/java/leets/weeth/domain/board/application/dto/NoticeDTO.java
@@ -5,6 +5,8 @@
 import leets.weeth.domain.comment.application.dto.CommentDTO;
 import leets.weeth.domain.file.application.dto.request.FileSaveRequest;
 import leets.weeth.domain.file.application.dto.response.FileResponse;
+import leets.weeth.domain.user.domain.entity.enums.Position;
+import leets.weeth.domain.user.domain.entity.enums.Role;
 import lombok.Builder;
 
 import java.time.LocalDateTime;
@@ -32,6 +34,8 @@ public record Update(
     public record Response(
             Long id,
             String name,
+            Position position,
+            Role role,
             String title,
             String content,
             LocalDateTime time,//modifiedAt
@@ -45,6 +49,8 @@ public record Response(
     public record ResponseAll(
             Long id,
             String name,
+            Position position,
+            Role role,
             String title,
             String content,
             LocalDateTime time,//modifiedAt

diff --git a/src/main/java/leets/weeth/domain/board/application/dto/PostDTO.java b/src/main/java/leets/weeth/domain/board/application/dto/PostDTO.java
@@ -6,6 +6,8 @@
 import leets.weeth.domain.file.application.dto.request.FileSaveRequest;
 import leets.weeth.domain.file.application.dto.request.FileUpdateRequest;
 import leets.weeth.domain.file.application.dto.response.FileResponse;
+import leets.weeth.domain.user.domain.entity.enums.Position;
+import leets.weeth.domain.user.domain.entity.enums.Role;
 import lombok.Builder;
 
 import java.time.LocalDateTime;
@@ -31,6 +33,8 @@ public record Update(
     public record Response(
             Long id,
             String name,
+            Position position,
+            Role role,
             String title,
             String content,
             LocalDateTime time,//modifiedAt
@@ -43,6 +47,8 @@ public record Response(
     public record ResponseAll(
             Long id,
             String name,
+            Position position,
+            Role role,
             String title,
             String content,
             LocalDateTime time,//modifiedAt

diff --git a/src/main/java/leets/weeth/domain/board/application/mapper/NoticeMapper.java b/src/main/java/leets/weeth/domain/board/application/mapper/NoticeMapper.java
@@ -25,50 +25,19 @@ public interface NoticeMapper {
 
     @Mappings({
             @Mapping(target = "name", source = "notice.user.name"),
+            @Mapping(target = "position", source = "notice.user.position"),
+            @Mapping(target = "role", source = "notice.user.role"),
             @Mapping(target = "time", source = "notice.modifiedAt"),
             @Mapping(target = "hasFile", expression = "java(fileExists)")
     })
     NoticeDTO.ResponseAll toAll(Notice notice, boolean fileExists);
 
     @Mappings({
             @Mapping(target = "name", source = "notice.user.name"),
-            @Mapping(target = "comments", expression = "java(filterParentComments(notice.getComments()))"),
+            @Mapping(target = "position", source = "notice.user.position"),
+            @Mapping(target = "role", source = "notice.user.role"),
             @Mapping(target = "time", source = "notice.modifiedAt")
     })
-    NoticeDTO.Response toNoticeDto(Notice notice, List<FileResponse> fileUrls);
-
-    default List<CommentDTO.Response> filterParentComments(List<Comment> comments) {
-        if (comments == null || comments.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        // 부모 댓글만 필터링하고, 각 부모 댓글에 대해 자식 댓글을 매핑
-        return comments.stream()
-                .filter(comment -> comment.getParent() == null) // 부모 댓글만 필터링
-                .map(this::mapCommentWithChildren) // 자식 댓글 포함하여 매핑
-                .toList();
-    }
-
-    default CommentDTO.Response mapCommentWithChildren(Comment comment) {
-        if (comment == null) {
-            return null;
-        }
-
-        // 기본 댓글 정보 매핑
-        CommentDTO.Response.ResponseBuilder response = CommentDTO.Response.builder();
-
-        response.name(comment.getUser().getName());
-        response.time(comment.getModifiedAt());
-        response.id(comment.getId());
-        response.content(comment.getContent());
-
-        // 자식 댓글들을 재귀적으로 매핑하여 children 필드에 설정
-        List<CommentDTO.Response> childrenResponses = comment.getChildren().stream()
-                .map(this::mapCommentWithChildren) // 자식 댓글도 동일하게 처리
-                .collect(Collectors.toList());
-        response.children(childrenResponses);
-
-        return response.build();
-    }
+    NoticeDTO.Response toNoticeDto(Notice notice, List<FileResponse> fileUrls, List<CommentDTO.Response> comments);
 
 }
diff --git a/src/main/java/leets/weeth/domain/board/application/mapper/PostMapper.java b/src/main/java/leets/weeth/domain/board/application/mapper/PostMapper.java
@@ -25,6 +25,8 @@ public interface PostMapper {
 
     @Mappings({
             @Mapping(target = "name", source = "post.user.name"),
+            @Mapping(target = "position", source = "post.user.position"),
+            @Mapping(target = "role", source = "post.user.role"),
             @Mapping(target = "time", source = "post.modifiedAt"),
             @Mapping(target = "hasFile", expression = "java(fileExists)")
     })
@@ -33,43 +35,10 @@ public interface PostMapper {
 
     @Mappings({
             @Mapping(target = "name", source = "post.user.name"),
-            @Mapping(target = "comments", expression = "java(filterParentComments(post.getComments()))"),
+            @Mapping(target = "position", source = "post.user.position"),
+            @Mapping(target = "role", source = "post.user.role"),
             @Mapping(target = "time", source = "post.modifiedAt")
     })
-    PostDTO.Response toPostDto(Post post, List<FileResponse> fileUrls);
-
-    default List<CommentDTO.Response> filterParentComments(List<Comment> comments) {
-        if (comments == null || comments.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        // 부모 댓글만 필터링하고, 각 부모 댓글에 대해 자식 댓글을 매핑
-        return comments.stream()
-                .filter(comment -> comment.getParent() == null) // 부모 댓글만 필터링
-                .map(this::mapCommentWithChildren) // 자식 댓글 포함하여 매핑
-                .toList();
-    }
-
-    default CommentDTO.Response mapCommentWithChildren(Comment comment) {
-        if (comment == null) {
-            return null;
-        }
-
-        // 기본 댓글 정보 매핑
-        CommentDTO.Response.ResponseBuilder response = CommentDTO.Response.builder();
-
-        response.name(comment.getUser().getName());
-        response.time(comment.getModifiedAt());
-        response.id(comment.getId());
-        response.content(comment.getContent());
-
-        // 자식 댓글들을 재귀적으로 매핑하여 children 필드에 설정
-        List<CommentDTO.Response> childrenResponses = comment.getChildren().stream()
-                .map(this::mapCommentWithChildren) // 자식 댓글도 동일하게 처리
-                .collect(Collectors.toList());
-        response.children(childrenResponses);
-
-        return response.build();
-    }
+    PostDTO.Response toPostDto(Post post, List<FileResponse> fileUrls, List<CommentDTO.Response> comments);
 
 }
diff --git a/src/main/java/leets/weeth/domain/board/application/usecase/NoticeUsecaseImpl.java b/src/main/java/leets/weeth/domain/board/application/usecase/NoticeUsecaseImpl.java
@@ -8,6 +8,8 @@
 import leets.weeth.domain.board.domain.service.NoticeFindService;
 import leets.weeth.domain.board.domain.service.NoticeSaveService;
 import leets.weeth.domain.board.domain.service.NoticeUpdateService;
+import leets.weeth.domain.comment.application.dto.CommentDTO;
+import leets.weeth.domain.comment.domain.entity.Comment;
 import leets.weeth.domain.file.application.dto.response.FileResponse;
 import leets.weeth.domain.file.application.mapper.FileMapper;
 import leets.weeth.domain.file.domain.entity.File;
@@ -26,7 +28,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -67,7 +71,7 @@ public NoticeDTO.Response findNotice(Long noticeId) {
                 .map(fileMapper::toFileResponse)
                 .toList();
 
-        return mapper.toNoticeDto(notice, response);
+        return mapper.toNoticeDto(notice, response, filterParentComments(notice.getComments()));
     }
 
     @Override
@@ -117,8 +121,42 @@ private Notice validateOwner(Long noticeId, Long userId) {
         return notice;
     }
 
-    public boolean checkFileExistsByNotice(Long noticeId){
+    private boolean checkFileExistsByNotice(Long noticeId){
         return !fileGetService.findAllByNotice(noticeId).isEmpty();
     }
 
+    private List<CommentDTO.Response> filterParentComments(List<Comment> comments) {
+        if (comments == null || comments.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        // 부모 댓글만 필터링하고, 각 부모 댓글에 대해 자식 댓글을 매핑
+        return comments.stream()
+            .filter(comment -> comment.getParent() == null) // 부모 댓글만 필터링
+            .map(this::mapCommentWithChildren) // 자식 댓글 포함하여 매핑
+            .toList();
+    }
+
+    private CommentDTO.Response mapCommentWithChildren(Comment comment) {
+        if (comment == null) {
+            return null;
+        }
+
+        // 기본 댓글 정보 매핑
+        CommentDTO.Response.ResponseBuilder response = CommentDTO.Response.builder();
+
+        response.name(comment.getUser().getName());
+        response.time(comment.getModifiedAt());
+        response.id(comment.getId());
+        response.content(comment.getContent());
+
+        // 자식 댓글들을 재귀적으로 매핑하여 children 필드에 설정
+        List<CommentDTO.Response> childrenResponses = comment.getChildren().stream()
+            .map(this::mapCommentWithChildren) // 자식 댓글도 동일하게 처리
+            .collect(Collectors.toList());
+        response.children(childrenResponses);
+
+        return response.build();
+    }
+
 }
diff --git a/src/main/java/leets/weeth/domain/board/application/usecase/PostUseCaseImpl.java b/src/main/java/leets/weeth/domain/board/application/usecase/PostUseCaseImpl.java
@@ -8,6 +8,8 @@
 import leets.weeth.domain.board.domain.service.PostFindService;
 import leets.weeth.domain.board.domain.service.PostSaveService;
 import leets.weeth.domain.board.domain.service.PostUpdateService;
+import leets.weeth.domain.comment.application.dto.CommentDTO;
+import leets.weeth.domain.comment.domain.entity.Comment;
 import leets.weeth.domain.file.application.dto.response.FileResponse;
 import leets.weeth.domain.file.application.mapper.FileMapper;
 import leets.weeth.domain.file.domain.entity.File;
@@ -23,7 +25,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -64,7 +68,8 @@ public PostDTO.Response findPost(Long postId) {
                 .map(fileMapper::toFileResponse)
                 .toList();
 
-        return mapper.toPostDto(post, response);
+
+        return mapper.toPostDto(post, response, filterParentComments(post.getComments()));
     }
 
     @Override
@@ -120,4 +125,38 @@ public boolean checkFileExistsByPost(Long postId){
         return !fileGetService.findAllByPost(postId).isEmpty();
     }
 
+    private List<CommentDTO.Response> filterParentComments(List<Comment> comments) {
+        if (comments == null || comments.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        // 부모 댓글만 필터링하고, 각 부모 댓글에 대해 자식 댓글을 매핑
+        return comments.stream()
+            .filter(comment -> comment.getParent() == null) // 부모 댓글만 필터링
+            .map(this::mapCommentWithChildren) // 자식 댓글 포함하여 매핑
+            .toList();
+    }
+
+    private CommentDTO.Response mapCommentWithChildren(Comment comment) {
+        if (comment == null) {
+            return null;
+        }
+
+        // 기본 댓글 정보 매핑
+        CommentDTO.Response.ResponseBuilder response = CommentDTO.Response.builder();
+
+        response.name(comment.getUser().getName());
+        response.time(comment.getModifiedAt());
+        response.id(comment.getId());
+        response.content(comment.getContent());
+
+        // 자식 댓글들을 재귀적으로 매핑하여 children 필드에 설정
+        List<CommentDTO.Response> childrenResponses = comment.getChildren().stream()
+            .map(this::mapCommentWithChildren) // 자식 댓글도 동일하게 처리
+            .collect(Collectors.toList());
+        response.children(childrenResponses);
+
+        return response.build();
+    }
+
 }
diff --git a/src/main/java/leets/weeth/domain/comment/application/dto/CommentDTO.java b/src/main/java/leets/weeth/domain/comment/application/dto/CommentDTO.java
@@ -1,6 +1,8 @@
 package leets.weeth.domain.comment.application.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import leets.weeth.domain.user.domain.entity.enums.Position;
+import leets.weeth.domain.user.domain.entity.enums.Role;
 import lombok.Builder;
 
 import java.time.LocalDateTime;
@@ -23,6 +25,8 @@ public record Update(
     public record Response(
             Long id,
             String name,
+            Position position,
+            Role role,
             String content,
             LocalDateTime time, //modifiedAt
             List<CommentDTO.Response> children

diff --git a/src/main/java/leets/weeth/domain/comment/application/mapper/CommentMapper.java b/src/main/java/leets/weeth/domain/comment/application/mapper/CommentMapper.java
@@ -36,7 +36,9 @@ public interface CommentMapper {
     })
     Comment fromCommentDto(CommentDTO.Save dto, Notice notice, User user, Comment parent);
 
-    @Mapping(target = "name", source = "user.name")
+    @Mapping(target = "name", source = "comment.user.name")
+    @Mapping(target = "position", source = "comment.user.position")
+    @Mapping(target = "role", source = "comment.user.role")
     @Mapping(target = "time", source = "modifiedAt")
     CommentDTO.Response toCommentDto(Comment comment);
 }