refacor: 댓글/대댓글 쿼리문에서 dto로 받기 (#127)

sunwon12 · web-flow · commit e74987f7b735 · 2023-12-18T23:41:04.000+09:00
* refacor: 댓글/대댓글 쿼리문에서 dto로 받기 * refacor: 댓글/대댓글 쿼리문에서 dto로 받기 * refactor: 좋아요 수에 따른 정렬 추가 * Feat: 자체엑세스토큰을 통해 로그인 (#124) * chore: 디렉토리 구조 수정 * feat: login By accessToken * remove: todo 주석 삭제 * refacor: 댓글/대댓글 쿼리문에서 dto로 받기 * refactor: 문자열 변수로 변경 * refactor: WriterResponse 추가
diff --git a/src/main/java/com/flint/flint/community/controller/PostCommentGetController.java b/src/main/java/com/flint/flint/community/controller/PostCommentGetController.java
@@ -1,7 +1,7 @@
 package com.flint.flint.community.controller;
 
 import com.flint.flint.common.ResponseForm;
-import com.flint.flint.community.dto.response.PostCommentGetResponse;
+import com.flint.flint.community.dto.response.PostCommentResponse;
 import com.flint.flint.community.service.PostCommentGetService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -28,7 +28,7 @@ public class PostCommentGetController {
      * 특정 포스트 댓글/대댓글 조회
      */
     @GetMapping("/{postId}")
-    public ResponseForm<List<PostCommentGetResponse>> getPostComment(@PathVariable long postId) {
+    public ResponseForm<List<PostCommentResponse>> getPostComment(@PathVariable long postId) {
         return new ResponseForm<>(postCommentGeteService.getPostComment(postId));
     }
 }
diff --git a/src/main/java/com/flint/flint/community/domain/post/PostComment.java b/src/main/java/com/flint/flint/community/domain/post/PostComment.java
@@ -64,4 +64,5 @@ public void addCommentReply(PostComment reply) {
     public void updateContent(String contents) {
         this.contents = contents;
     }
+
 }
diff --git a/src/main/java/com/flint/flint/community/dto/response/PostCommentGetResponse.java b/src/main/java/com/flint/flint/community/dto/response/PostCommentGetResponse.java
diff --git a/src/main/java/com/flint/flint/community/dto/response/PostCommentResponse.java b/src/main/java/com/flint/flint/community/dto/response/PostCommentResponse.java
@@ -0,0 +1,37 @@
+package com.flint.flint.community.dto.response;
+
+import com.querydsl.core.annotations.QueryProjection;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Writer;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PostCommentResponse {
+
+    private Long parentCommentId;
+    private long postCommentId;
+    private String contents;
+    private LocalDateTime createdAt;
+    private long memberId;
+    private Long likeCount;
+    private String logoUrl;
+    private WriterResponse writerResponse;
+    private List<PostCommentResponse> replies = new ArrayList<>();
+
+    @QueryProjection
+    public PostCommentResponse(Long parentCommentId, long postCommentId, String contents, LocalDateTime createdAt, Long likeCount, WriterResponse writerResponse) {
+        this.parentCommentId = parentCommentId;
+        this.postCommentId = postCommentId;
+        this.contents = contents;
+        this.createdAt = createdAt;
+        this.likeCount = likeCount;
+        this.writerResponse = writerResponse;
+    }
+}
diff --git a/src/main/java/com/flint/flint/community/dto/response/WriterResponse.java b/src/main/java/com/flint/flint/community/dto/response/WriterResponse.java
@@ -1,17 +1,24 @@
 package com.flint.flint.community.dto.response;
 
-import lombok.AllArgsConstructor;
+import com.querydsl.core.annotations.QueryProjection;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @Builder
 @NoArgsConstructor
-@AllArgsConstructor
 public class WriterResponse {
     private Long memberId;
     private String universityLogoUrl;
     private String universityName;
     private String major;
+
+    @QueryProjection
+    public WriterResponse(Long memberId, String universityLogoUrl, String universityName, String major) {
+        this.memberId = memberId;
+        this.universityLogoUrl = universityLogoUrl;
+        this.universityName = universityName;
+        this.major = major;
+    }
 }
diff --git a/src/main/java/com/flint/flint/community/repository/post_comment/PostCommentRepositoryCustom.java b/src/main/java/com/flint/flint/community/repository/post_comment/PostCommentRepositoryCustom.java
@@ -1,6 +1,6 @@
 package com.flint.flint.community.repository.post_comment;
 
-import com.flint.flint.community.domain.post.PostComment;
+import com.flint.flint.community.dto.response.PostCommentResponse;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -9,7 +9,8 @@
  * @author 정순원
  * @since 2023-11-06
  */
+
 @Repository
 public interface PostCommentRepositoryCustom {
-    List<PostComment> findByPostId(Long postId);
+    List<PostCommentResponse> findByPostId(Long postId);
 }
diff --git a/src/main/java/com/flint/flint/community/repository/post_comment/PostCommentRepositoryImpl.java b/src/main/java/com/flint/flint/community/repository/post_comment/PostCommentRepositoryImpl.java
@@ -1,13 +1,23 @@
 package com.flint.flint.community.repository.post_comment;
 
-import com.flint.flint.community.domain.post.PostComment;
+import com.flint.flint.community.dto.response.PostCommentResponse;
+import com.flint.flint.community.dto.response.QPostCommentResponse;
+import com.flint.flint.community.dto.response.QWriterResponse;
+import com.flint.flint.community.dto.response.WriterResponse;
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.jpa.JPAExpressions;
+import com.querydsl.jpa.JPQLQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
+import static com.flint.flint.asset.domain.QUniversityAsset.universityAsset;
 import static com.flint.flint.community.domain.post.QPostComment.postComment;
+import static com.flint.flint.community.domain.post.QPostCommentLike.postCommentLike;
+import static com.flint.flint.idcard.domain.QIdCard.idCard;
 
 /**
  * @author 정순원
@@ -20,14 +30,28 @@ public class PostCommentRepositoryImpl implements PostCommentRepositoryCustom {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public List<PostComment> findByPostId(Long postId) {
+    public List<PostCommentResponse> findByPostId(Long postId) {
+        JPQLQuery<Long> likeCountSubQuery = JPAExpressions
+                .select(postCommentLike.count())
+                .from(postCommentLike)
+                .where(postCommentLike.postComment.eq(postComment));
+
         return queryFactory
-                .selectFrom(postComment)
-                .join(postComment.parentComment).fetchJoin()
-                .where(postComment.post.id.eq(postId))
-                .orderBy(postComment.parentComment.id.asc().nullsFirst(),
-                        postComment.createdAt.asc())
+                .select(new QPostCommentResponse(
+                        postComment.parentComment.id,
+                        postComment.id,
+                        postComment.contents,
+                        postComment.createdAt,
+                        likeCountSubQuery,
+                        new QWriterResponse(
+                                idCard.member.id,
+                                universityAsset.logoUrl,
+                                idCard.university,
+                                idCard.major)))
+                .from(postComment, idCard)
+                .innerJoin(universityAsset).on(universityAsset.universityName.eq(idCard.university))
+                .where(postComment.post.id.eq(postId).and(idCard.member.id.eq(postComment.member.id)))
+                .orderBy(postComment.createdAt.asc())
                 .fetch();
     }
-
-}
+}
diff --git a/src/main/java/com/flint/flint/community/service/PostCommentGetService.java b/src/main/java/com/flint/flint/community/service/PostCommentGetService.java
@@ -1,7 +1,7 @@
 package com.flint.flint.community.service;
 
-import com.flint.flint.community.domain.post.PostComment;
-import com.flint.flint.community.dto.response.PostCommentGetResponse;
+
+import com.flint.flint.community.dto.response.PostCommentResponse;
 import com.flint.flint.community.repository.post_comment.PostCommentRepositoryCustom;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -17,29 +17,65 @@
 @RequiredArgsConstructor
 public class PostCommentGetService {
 
+    private final static int PRIORITY_LIKE_CRITERIA = 3;
     private final PostCommentRepositoryCustom postCommentRepositoryCustom;
 
-    @Transactional
-    public List<PostCommentGetResponse> getPostComment(long postId) {
-        List<PostComment> postCommentList = postCommentRepositoryCustom.findByPostId(postId);
+    @Transactional(readOnly = true)
+    public List<PostCommentResponse> getPostComment(long postId) {
+        List<PostCommentResponse> commentResponses = postCommentRepositoryCustom.findByPostId(postId);
+
+        // 공감수에 따라 댓글 분류
+        List<PostCommentResponse> highLikesParentComments = new ArrayList<>();
+        List<PostCommentResponse> lowLikesParentComments = new ArrayList<>();
+        List<PostCommentResponse> highLikesChildComments = new ArrayList<>();
+        List<PostCommentResponse> lowLikesChildComments = new ArrayList<>();
+
+        for (PostCommentResponse comment : commentResponses) {
+            if (comment.getParentCommentId() == null) {
+                if (comment.getLikeCount() != null && comment.getLikeCount() >= PRIORITY_LIKE_CRITERIA) {
+                    highLikesParentComments.add(comment);
+                } else {
+                    lowLikesParentComments.add(comment);
+                }
+            } else {
+                if (comment.getLikeCount() != null && comment.getLikeCount() >= PRIORITY_LIKE_CRITERIA) {
+                    highLikesChildComments.add(comment);
+                } else {
+                    lowLikesChildComments.add(comment);
+                }
+            }
+        }
+
+        // 공감수가 높은 댓글을 공감수 내림차순으로 정렬
+        highLikesParentComments.sort(Comparator.comparing(PostCommentResponse::getLikeCount).reversed());
+        highLikesChildComments.sort(Comparator.comparing(PostCommentResponse::getLikeCount).reversed());
+
+        // 공감수가 낮은 댓글을 생성 시간 오름차순으로 정렬
+        lowLikesParentComments.sort(Comparator.comparing(PostCommentResponse::getCreatedAt).reversed());
+        lowLikesChildComments.sort(Comparator.comparing(PostCommentResponse::getCreatedAt).reversed());
 
-        List<PostCommentGetResponse> responseList = new ArrayList<>();
-        Map<Long, PostCommentGetResponse> responseHashMap = new HashMap<>();
 
-        postCommentList.forEach(postComment -> {
-            PostCommentGetResponse postCommentGetResponse = PostCommentGetResponse.convertCommentToDTO(postComment);
-            responseHashMap.put(postCommentGetResponse.getPostCommentId(), postCommentGetResponse);
+        // 최종 결과 리스트 생성
+        List<PostCommentResponse> sortedComments = new ArrayList<>();
+        sortedComments.addAll(highLikesParentComments);
+        sortedComments.addAll(lowLikesParentComments);
+        sortedComments.addAll(highLikesChildComments);
+        sortedComments.addAll(lowLikesChildComments);
 
-            // 대댓글인 경우 부모 댓글의 replies에 추가
-            Optional.ofNullable(postComment.getParentComment())
-                    .map(parent -> responseHashMap.get(parent.getId()))
-                    .ifPresent(parentResponse -> parentResponse.getReplies().add(postCommentGetResponse));
+        // 대댓글 구조 재구성
+        Map<Long, PostCommentResponse> commentMap = new HashMap<>();
+        List<PostCommentResponse> parentCommentResponses = new ArrayList<>();
 
-            // 댓글인 경우 ResponseList에 추가
-            if (postComment.getParentComment() == null) {
-                responseList.add(postCommentGetResponse);
+        for (PostCommentResponse commentResponse : sortedComments) {
+            commentMap.put(commentResponse.getPostCommentId(), commentResponse);
+            if (commentResponse.getParentCommentId() == null) {
+                parentCommentResponses.add(commentResponse);
+            } else {
+                if (commentMap.containsKey(commentResponse.getParentCommentId())) {
+                    commentMap.get(commentResponse.getParentCommentId()).getReplies().add(commentResponse);
+                }
             }
-        });
-        return responseList;
+        }
+        return parentCommentResponses;
     }
-}
+}
diff --git a/src/main/java/com/flint/flint/security/oauth/KakaoOAuth2UserAttribute.java b/src/main/java/com/flint/flint/security/oauth/KakaoOAuth2UserAttribute.java
@@ -33,7 +33,7 @@ public Member toEntity() {
 
         return Member.builder()
                 .providerName(KAKAO_PROVIDER_ID)
-                .providerId(getProviderId())//띄어쓰기 포함
+                .providerId(getProviderId())
                 .email(getEmail())
                 .name(getName())
                 .gender(Gender.valueOf(getGender().toUpperCase())) //대소문자 구별하니 바꿔줘야 함
@@ -71,7 +71,6 @@ public String getBirthday() {
     @Override
     public void setUserAttributesByOauthToken(String kakaoAccessToken) {
 
-
         JSONObject response = WebClient.create()
                 .get()
                 .uri("https://kapi.kakao.com/v2/user/me")
diff --git a/src/main/java/com/flint/flint/security/oauth/NaverOAuth2UserAttribute.java b/src/main/java/com/flint/flint/security/oauth/NaverOAuth2UserAttribute.java
@@ -42,7 +42,7 @@ public Member toEntity() {
 
     @Override
     public String getProviderId() {
-        return "naver " + response.get("id").toString();
+        return NAVER_PROVIDER_ID + "_" + response.get("id").toString();
     }
 
     @Override
diff --git a/src/test/java/com/flint/flint/community/controller/PostCommentGetControllerTest.java b/src/test/java/com/flint/flint/community/controller/PostCommentGetControllerTest.java

Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,5 @@ public void addCommentReply(PostComment reply) {`
`64`	`64`	`public void updateContent(String contents) {`
`65`	`65`	`this.contents = contents;`
`66`	`66`	`}`
	`67`	`+`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public Member toEntity() {`
`42`	`42`
`43`	`43`	`@Override`
`44`	`44`	`public String getProviderId() {`
`45`		`- return "naver " + response.get("id").toString();`
	`45`	`+ return NAVER_PROVIDER_ID + "_" + response.get("id").toString();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`