[Fix] 댓글 개수 조회 차단된 유저의 댓글 및 답글 제외

keewe-api/src/main/java/ccc/keeweapi/service/insight/query/InsightCommentQueryApiService.java

@@ -69,6 +69,8 @@ public List<ReplyResponse> getReplies(Long parentId, CursorPageable<Long> cPage)
     }
 
     public InsightCommentCountResponse getCommentCount(Long insightId) {
-        return commentAssembler.toInsightCommentCountResponse(commentDomainService.countByInsightId(insightId));
+        blockFilterUtil.filterInsightWriter(insightId);
+        Long userId = SecurityUtil.getUserId();
+        return commentAssembler.toInsightCommentCountResponse(commentDomainService.countByInsightId(insightId, userId));
     }
 }

keewe-api/src/main/java/ccc/keeweapi/service/insight/query/InsightQueryApiService.java

@@ -120,7 +120,7 @@ public InsightStatisticsResponse getStatistics(Long insightId) {
         insightQueryDomainService.validateWriter(SecurityUtil.getUserId(), insightId);
         Long viewCount = insightQueryDomainService.getViewCount(insightId);
         Long reactionCount = reactionDomainService.getCurrentReactionAggregation(insightId).getAllReactionCount();
-        Long commentCount = commentDomainService.countByInsightId(insightId);
+        Long commentCount = commentDomainService.countByInsightId(insightId, SecurityUtil.getUserId());
         Long bookmarkCount = bookmarkQueryDomainService.countBookmarkByInsightId(insightId);
         Long shareCount = 0L; // FIXME 공유 카운팅 추가 시 변경 필요
         return insightAssembler.toInsightStatisticsResponse(viewCount, reactionCount, commentCount,bookmarkCount, shareCount);

keewe-domain/src/main/java/ccc/keewedomain/persistence/repository/insight/CommentQueryRepository.java

@@ -10,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -152,4 +153,31 @@ private JPQLQuery<Long> findFirstReplyIds(List<Comment> parents) {
                 .groupBy(comment.parent.id)
                 .where(comment.parent.in(parents));
     }
+
+    public List<Long> findIdsByUserIds(Long insightId, Collection<Long> blockedUserIds) {
+        return queryFactory
+                .select(comment.id)
+                .from(comment)
+                .where(comment.insight.id.eq(insightId))
+                .where(comment.writer.id.in(blockedUserIds))
+                .fetch();
+    }
+
+    public Long countByParentIds(List<Long> blockedUserCommentIds) {
+        return queryFactory
+                .select(comment.count())
+                .from(comment)
+                .where(comment.parent.id.in(blockedUserCommentIds))
+                .fetchFirst();
+    }
+
+    public Long countRepliesByUserIds(Long insightId, Collection<Long> blockedUserIds) {
+        return queryFactory
+                .select(comment.count())
+                .from(comment)
+                .where(comment.insight.id.eq(insightId))
+                .where(comment.parent.id.isNotNull())
+                .where(comment.writer.id.in(blockedUserIds))
+                .fetchFirst();
+    }
 }

keewe-domain/src/main/java/ccc/keewedomain/service/insight/CommentDomainService.java

@@ -12,13 +12,15 @@
 import ccc.keewedomain.persistence.repository.utils.CursorPageable;
 import ccc.keewedomain.service.insight.query.InsightQueryDomainService;
 import ccc.keewedomain.service.user.UserDomainService;
+import ccc.keewedomain.service.user.query.ProfileQueryDomainService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
@@ -28,6 +30,7 @@ public class CommentDomainService {
     private final CommentQueryRepository commentQueryRepository;
     private final InsightQueryDomainService insightQueryDomainService;
     private final UserDomainService userDomainService;
+    private final ProfileQueryDomainService profileQueryDomainService;
 
     public Comment create(CommentCreateDto dto) {
         Insight insight = insightQueryDomainService.getByIdOrElseThrow(dto.getInsightId());
@@ -68,8 +71,20 @@ private void validateHasNoParent(Comment comment) {
         }
     }
 
-    public Long countByInsightId(Long insightId) {
-        return commentQueryRepository.countByInsightId(insightId);
+    public Long countByInsightId(Long insightId, Long userId) {
+        Long commentCount = commentQueryRepository.countByInsightId(insightId);
+        Set<Long> blockedUserIds = profileQueryDomainService.findBlockedUserIds(userId);
+        if(blockedUserIds.isEmpty()) {
+            return commentCount;
+        }
+        // 1. 차단한 유저의 댓글 제외 - 차단한 유저들이 작성한 댓글의 id 조회
+        List<Long> blockedUserCommentIds = commentQueryRepository.findIdsByUserIds(insightId, blockedUserIds);
+        // 2. 차단한 유저의 댓글에 달린 답글 제외 - 1에서 조회한 id가 parent인 댓글 개수 조회
+        Long replyOnBlockedCommentCount = commentQueryRepository.countByParentIds(blockedUserCommentIds);
+        // 3. 차단한 유저의 답글 수 조회 - 1, 2에서 중복으로 제거되는 개수 보완 목적
+        Long dupBlockedReplyCount = commentQueryRepository.countRepliesByUserIds(insightId, blockedUserIds);
+        // 4. 전체 개수에서 빼기
+        return commentCount - blockedUserCommentIds.size() - replyOnBlockedCommentCount + dupBlockedReplyCount;
     }
 
     public Map<Long, Long> getReplyNumbers(List<Comment> parents) {