From 5596675157ea6d2cdc9da305655fef95017b83b4 Mon Sep 17 00:00:00 2001
From: ybchar <uiurihappy@naver.com>
Date: Tue, 22 Oct 2024 16:13:35 +0900
Subject: [PATCH] =?UTF-8?q?hotfix:=20=ED=94=BC=EB=93=9C=20=EB=8C=93?=
 =?UTF-8?q?=EA=B8=80=20=EC=88=98=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=83=88=ED=87=B4=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/auth/application/AuthService.java         |  1 -
 .../domain/comment/application/CommentService.java   | 12 ++++++++----
 .../stonebed/domain/feed/dao/FeedRepositoryImpl.java | 10 ++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/depromeet/stonebed/domain/auth/application/AuthService.java b/src/main/java/com/depromeet/stonebed/domain/auth/application/AuthService.java
index 7e78054..33b5bdd 100644
--- a/src/main/java/com/depromeet/stonebed/domain/auth/application/AuthService.java
+++ b/src/main/java/com/depromeet/stonebed/domain/auth/application/AuthService.java
@@ -180,7 +180,6 @@ private void updateMemberNormalStatus(Member member) {
     }
 
     private void withdrawMemberRelationByMemberId(List<Long> recordIds, Long memberId) {
-        commentRepository.updateEmptyMemberAllByMember(memberId);
         missionRecordBoostRepository.deleteAllByRecordIds(recordIds);
         missionRecordRepository.deleteAllByMember(memberId);
         fcmNotificationRepository.deleteAllByMember(memberId);
diff --git a/src/main/java/com/depromeet/stonebed/domain/comment/application/CommentService.java b/src/main/java/com/depromeet/stonebed/domain/comment/application/CommentService.java
index 9d2d044..5f21a08 100644
--- a/src/main/java/com/depromeet/stonebed/domain/comment/application/CommentService.java
+++ b/src/main/java/com/depromeet/stonebed/domain/comment/application/CommentService.java
@@ -11,6 +11,7 @@
 import com.depromeet.stonebed.domain.fcm.domain.FcmNotificationType;
 import com.depromeet.stonebed.domain.fcm.domain.FcmToken;
 import com.depromeet.stonebed.domain.member.domain.Member;
+import com.depromeet.stonebed.domain.member.domain.MemberStatus;
 import com.depromeet.stonebed.domain.missionRecord.dao.MissionRecordRepository;
 import com.depromeet.stonebed.domain.missionRecord.domain.MissionRecord;
 import com.depromeet.stonebed.global.common.constants.FcmNotificationConstants;
@@ -211,15 +212,18 @@ private CommentFindOneResponse convertToCommentFindOneResponse(
                         .collect(Collectors.toList());
 
         // 작성자가 null인지 확인
-        Long writerId = comment.getWriter() != null ? comment.getWriter().getId() : null;
+        Long writerId =
+                comment.getWriter().getStatus() != MemberStatus.DELETED
+                        ? comment.getWriter().getId()
+                        : null;
         String writerNickname =
-                comment.getWriter() != null
+                comment.getWriter().getStatus() != MemberStatus.DELETED
                         ? comment.getWriter().getProfile().getNickname()
                         : "탈퇴한 회원";
         String writerProfileImageUrl =
-                comment.getWriter() != null
+                comment.getWriter().getStatus() != MemberStatus.DELETED
                         ? comment.getWriter().getProfile().getProfileImageUrl()
-                        : null;
+                        : "INACTIVE_" + comment.getWriter().getRaisePet().getValue();
 
         return CommentFindOneResponse.of(
                 comment.getParent() != null ? comment.getParent().getId() : null,
diff --git a/src/main/java/com/depromeet/stonebed/domain/feed/dao/FeedRepositoryImpl.java b/src/main/java/com/depromeet/stonebed/domain/feed/dao/FeedRepositoryImpl.java
index 0e80ab8..80fa3bc 100644
--- a/src/main/java/com/depromeet/stonebed/domain/feed/dao/FeedRepositoryImpl.java
+++ b/src/main/java/com/depromeet/stonebed/domain/feed/dao/FeedRepositoryImpl.java
@@ -13,6 +13,7 @@
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
@@ -62,7 +63,10 @@ private JPAQuery<FindFeedDto> getBaseSelectQuery() {
                         mission,
                         missionRecord,
                         member,
-                        comment.id.count().as("commentCount"),
+                        // 서브쿼리를 통해 댓글 개수 계산
+                        JPAExpressions.select(comment.id.count())
+                                .from(comment)
+                                .where(comment.recordId.eq(missionRecord.id)),
                         Expressions.asNumber(missionRecordBoost.count.sumLong().coalesce(0L))
                                 .as("totalBoostCount")));
     }
@@ -76,9 +80,7 @@ private JPAQuery<FindFeedDto> applyJoinsAndConditions(JPAQuery<FindFeedDto> quer
                 .leftJoin(missionHistory)
                 .on(missionRecord.missionHistory.eq(missionHistory))
                 .leftJoin(mission)
-                .on(missionHistory.mission.eq(mission))
-                .leftJoin(comment)
-                .on(comment.recordId.eq(missionRecord.id)); // Join Comment entity
+                .on(missionHistory.mission.eq(mission));
     }
 
     private BooleanExpression ltMissionRecordId(Long missionRecordId) {