Merge pull request #202 from techeer-sv/BE/#201

BE/#201 Comment 도메인 QueryDSL 리팩토링
techeer-sv · Sep 11, 2023 · c0b103b · c0b103b
2 parents bb42474 + a7fbb40
commit c0b103b
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 59 deletions.
diff --git a/...in/java/com/graphy/backend/domain/comment/dto/response/GetCommentWithMaskingResponse.java b/...in/java/com/graphy/backend/domain/comment/dto/response/GetCommentWithMaskingResponse.java
@@ -1,5 +1,6 @@
 package com.graphy.backend.domain.comment.dto.response;
 
+import com.querydsl.core.annotations.QueryProjection;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -9,12 +10,20 @@
 
 @Getter
 @Builder
-@AllArgsConstructor
 @NoArgsConstructor
 public class GetCommentWithMaskingResponse {
     private String content;
     private Long commentId;
     private LocalDateTime createdAt;
     private String nickname;
     private Long childCount;
+
+    @QueryProjection
+    public GetCommentWithMaskingResponse(String content, Long commentId, LocalDateTime createdAt, String nickname, Long childCount) {
+        this.content = content;
+        this.commentId = commentId;
+        this.createdAt = createdAt;
+        this.nickname = nickname;
+        this.childCount = childCount;
+    }
 }
diff --git a/...nd/src/main/java/com/graphy/backend/domain/comment/dto/response/GetReplyListResponse.java b/...nd/src/main/java/com/graphy/backend/domain/comment/dto/response/GetReplyListResponse.java
@@ -1,6 +1,7 @@
 package com.graphy.backend.domain.comment.dto.response;
 
 import com.graphy.backend.domain.comment.domain.Comment;
+import com.querydsl.core.annotations.QueryProjection;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -10,14 +11,21 @@
 
 @Getter
 @Builder
-@AllArgsConstructor
 @NoArgsConstructor
 public class GetReplyListResponse {
     private String nickname;
     private String content;
     private Long commentId;
     private LocalDateTime createdAt;
 
+    @QueryProjection
+    public GetReplyListResponse(String nickname, String content, Long commentId, LocalDateTime createdAt) {
+        this.nickname = nickname;
+        this.content = content;
+        this.commentId = commentId;
+        this.createdAt = createdAt;
+    }
+
     public static GetReplyListResponse from(Comment comment) {
         return GetReplyListResponse.builder()
                 .nickname(comment.getMember().getNickname())

diff --git a/...d/src/main/java/com/graphy/backend/domain/comment/repository/CommentCustomRepository.java b/...d/src/main/java/com/graphy/backend/domain/comment/repository/CommentCustomRepository.java
@@ -1,12 +1,12 @@
 package com.graphy.backend.domain.comment.repository;
 
 
-import com.graphy.backend.domain.comment.domain.Comment;
 import com.graphy.backend.domain.comment.dto.response.GetCommentWithMaskingResponse;
+import com.graphy.backend.domain.comment.dto.response.GetReplyListResponse;
 
 import java.util.List;
 
 public interface CommentCustomRepository {
     List<GetCommentWithMaskingResponse> findCommentsWithMasking(Long id);
-    List<Comment> findReplyList(Long parentId);
+    List<GetReplyListResponse> findReplyList(Long parentId);
 }
diff --git a/...c/main/java/com/graphy/backend/domain/comment/repository/CommentCustomRepositoryImpl.java b/...c/main/java/com/graphy/backend/domain/comment/repository/CommentCustomRepositoryImpl.java
@@ -1,9 +1,10 @@
 package com.graphy.backend.domain.comment.repository;
 
-import com.graphy.backend.domain.comment.domain.Comment;
 import com.graphy.backend.domain.comment.domain.QComment;
 import com.graphy.backend.domain.comment.dto.response.GetCommentWithMaskingResponse;
-import com.querydsl.core.types.Projections;
+import com.graphy.backend.domain.comment.dto.response.GetReplyListResponse;
+import com.graphy.backend.domain.comment.dto.response.QGetCommentWithMaskingResponse;
+import com.graphy.backend.domain.comment.dto.response.QGetReplyListResponse;
 import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +23,7 @@ public List<GetCommentWithMaskingResponse> findCommentsWithMasking(Long id) {
         QComment child = new QComment("child");
 
         return jpaQueryFactory
-                .select(Projections.constructor(GetCommentWithMaskingResponse.class,
+                .select(new QGetCommentWithMaskingResponse(
                         new CaseBuilder()
                                 .when(comment.isDeleted.isTrue()).then("삭제된 댓글입니다.")
                                 .otherwise(comment.content),
@@ -42,10 +43,16 @@ public List<GetCommentWithMaskingResponse> findCommentsWithMasking(Long id) {
     }
 
     @Override
-    public List<Comment> findReplyList(Long parentId) {
+    public List<GetReplyListResponse> findReplyList(Long parentId) {
         return jpaQueryFactory
-                .selectFrom(comment)
-                .join(comment.member, member).fetchJoin()
+                .select(new QGetReplyListResponse(
+                        member.nickname,
+                        comment.content,
+                        comment.id,
+                        comment.createdAt
+                ))
+                .from(comment)
+                .join(comment.member, member)
                 .where(comment.parent.id.eq(parentId))
                 .orderBy(comment.createdAt.asc())
                 .fetch();

diff --git a/backend/src/main/java/com/graphy/backend/domain/comment/service/CommentService.java b/backend/src/main/java/com/graphy/backend/domain/comment/service/CommentService.java
@@ -56,13 +56,11 @@ public void deleteComment(Long id) {
     }
 
     public List<GetReplyListResponse> findCommentList(Long commentId) {
-        List<Comment> commentList = commentRepository.findReplyList(commentId);
+        List<GetReplyListResponse> commentList = commentRepository.findReplyList(commentId);
 
-        if (commentList.size() == 0) throw new EmptyResultException(ErrorCode.COMMENT_DELETED_OR_NOT_EXIST);
+        if (commentList.isEmpty()) throw new EmptyResultException(ErrorCode.COMMENT_DELETED_OR_NOT_EXIST);
 
-        return commentList.stream()
-                .map(GetReplyListResponse::from)
-                .collect(Collectors.toList());
+        return commentList;
 
     }
 

diff --git a/...end/src/main/java/com/graphy/backend/domain/project/dto/request/CreateProjectRequest.java b/...end/src/main/java/com/graphy/backend/domain/project/dto/request/CreateProjectRequest.java
@@ -30,7 +30,7 @@ public class CreateProjectRequest {
 
     private String thumbNail;
 
-    public Project toEntity( Member member) {
+    public Project toEntity(Member member) {
         return Project.builder()
                 .member(member)
                 .projectName(projectName)

diff --git a/...end/src/test/java/com/graphy/backend/domain/comment/repository/CommentRepositoryTest.java b/...end/src/test/java/com/graphy/backend/domain/comment/repository/CommentRepositoryTest.java
@@ -2,6 +2,7 @@
 
 import com.graphy.backend.domain.comment.domain.Comment;
 import com.graphy.backend.domain.comment.dto.response.GetCommentWithMaskingResponse;
+import com.graphy.backend.domain.comment.dto.response.GetReplyListResponse;
 import com.graphy.backend.domain.member.domain.Member;
 import com.graphy.backend.domain.member.domain.Role;
 import com.graphy.backend.domain.member.repository.MemberRepository;
@@ -149,25 +150,22 @@ public void findCommentWithMakingEmptyListTest() throws Exception {
     @DisplayName("댓글 ID를 입력 받아 답글 목록을 조회한다")
     public void findReCommentListTest() throws Exception {
         // when
-        List<Comment> actual = commentRepository.findReplyList(parentComment.getId());
+        List<GetReplyListResponse> actual = commentRepository.findReplyList(parentComment.getId());
 
         // then
         assertThat(actual.size()).isEqualTo(3);
 
-        assertThat(actual.get(0).getId()).isEqualTo(comment1.getId());
+        assertThat(actual.get(0).getNickname()).isEqualTo(member.getNickname());
         assertThat(actual.get(0).getContent()).isEqualTo(comment1.getContent());
-        assertThat(actual.get(0).getParent()).isEqualTo(comment1.getParent());
-        assertThat(actual.get(0).getProject()).isEqualTo(comment1.getProject());
+        assertThat(actual.get(0).getCommentId()).isEqualTo(comment1.getId());
 
-        assertThat(actual.get(1).getId()).isEqualTo(comment2.getId());
+        assertThat(actual.get(1).getNickname()).isEqualTo(member.getNickname());
         assertThat(actual.get(1).getContent()).isEqualTo(comment2.getContent());
-        assertThat(actual.get(1).getParent()).isEqualTo(comment2.getParent());
-        assertThat(actual.get(1).getProject()).isEqualTo(comment2.getProject());
+        assertThat(actual.get(1).getCommentId()).isEqualTo(comment2.getId());
 
-        assertThat(actual.get(2).getId()).isEqualTo(comment3.getId());
+        assertThat(actual.get(2).getNickname()).isEqualTo(member.getNickname());
         assertThat(actual.get(2).getContent()).isEqualTo(comment3.getContent());
-        assertThat(actual.get(2).getParent()).isEqualTo(comment3.getParent());
-        assertThat(actual.get(2).getProject()).isEqualTo(comment3.getProject());
+        assertThat(actual.get(2).getCommentId()).isEqualTo(comment3.getId());
     }
 
     @Test
@@ -177,7 +175,7 @@ public void findReCommentListEmptyListTest() throws Exception {
         Long 답글이_존재하지_않는_댓글_ID = 0L;
 
         // when
-        List<Comment> actual = commentRepository.findReplyList(답글이_존재하지_않는_댓글_ID);
+        List<GetReplyListResponse> actual = commentRepository.findReplyList(답글이_존재하지_않는_댓글_ID);
 
         // then
         assertThat(actual.size()).isEqualTo(0);

diff --git a/backend/src/test/java/com/graphy/backend/domain/comment/service/CommentServiceTest.java b/backend/src/test/java/com/graphy/backend/domain/comment/service/CommentServiceTest.java
@@ -176,43 +176,18 @@ void removeReCommentNotExistParentCommentExceptionTest() {
     @DisplayName("답글 목록을 조회한다")
     void findReCommentListTest() {
         //given
-        Comment reComment1 = Comment.builder()
-                .id(2L)
-                .content("reComment1")
-                .parent(parentComment)
-                .member(member)
-                .build();
-
-        Comment reComment2 = Comment.builder()
-                .id(3L)
-                .content("reComment2")
-                .parent(parentComment).member(member)
-                .build();
-
-        Comment reComment3 = Comment.builder()
-                .id(4L)
-                .content("reComment3")
-                .parent(parentComment)
-                .member(member)
-                .build();
-
-        List<Comment> commentList = new LinkedList<>(List.of(reComment1, reComment2, reComment3));
+        List<GetReplyListResponse> reCommentList = new LinkedList<>(Arrays.asList(
+                GetReplyListResponse.builder().nickname(member.getNickname()).content("reComment1").build(),
+                GetReplyListResponse.builder().nickname(member.getNickname()).content("reComment2").build(),
+                GetReplyListResponse.builder().nickname(member.getNickname()).content("reComment3").build()
+        ));
 
         //when
-        when(commentRepository.findReplyList(parentComment.getId())).thenReturn(commentList);
+        when(commentRepository.findReplyList(parentComment.getId())).thenReturn(reCommentList);
         List<GetReplyListResponse> actual = commentService.findCommentList(parentComment.getId());
 
         //then
-        assertThat(actual.size()).isEqualTo(commentList.size());
-
-        assertThat(actual.get(0).getCommentId()).isEqualTo(reComment1.getId());
-        assertThat(actual.get(0).getContent()).isEqualTo(reComment1.getContent());
-
-        assertThat(actual.get(1).getCommentId()).isEqualTo(reComment2.getId());
-        assertThat(actual.get(1).getContent()).isEqualTo(reComment2.getContent());
-
-        assertThat(actual.get(2).getCommentId()).isEqualTo(reComment3.getId());
-        assertThat(actual.get(2).getContent()).isEqualTo(reComment3.getContent());
+        assertThat(actual).usingRecursiveComparison().isEqualTo(reCommentList);
     }
 
     @Test