From c249a3eac5aef54dca8e8eca6268c52d892634ec Mon Sep 17 00:00:00 2001
From: JaeSeo Yang <96044622+psychology50@users.noreply.github.com>
Date: Tue, 5 Nov 2024 23:38:26 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=B5=9C=EA=B7=BC=20=ED=99=9C=EB=8F=99?=
 =?UTF-8?q?=20=EC=9D=B4=EB=A0=A5=EC=97=90=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=8F=AC=ED=95=A8=EB=90=9C=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EC=BF=BC=EB=A6=AC=20=ED=98=B8=EC=B6=9C=20=EC=A0=9C?=
 =?UTF-8?q?=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/service/ChatRoomWithParticipantsSearchService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/chat/service/ChatRoomWithParticipantsSearchService.java b/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/chat/service/ChatRoomWithParticipantsSearchService.java
index ea6c33af1..ba69f7811 100644
--- a/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/chat/service/ChatRoomWithParticipantsSearchService.java
+++ b/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/chat/service/ChatRoomWithParticipantsSearchService.java
@@ -50,8 +50,8 @@ public ChatRoomRes.RoomWithParticipants execute(Long userId, Long chatRoomId) {
                 chatMemberService.readChatMembersByUserIdIn(chatRoomId, recentParticipantIds)
         );
 
-        // 내가 관리자가 아닌 경우, 관리자 정보 조회
-        if (!myInfo.getRole().equals(ChatMemberRole.ADMIN)) {
+        // 내가 관리자가 아니거나, 최근 활동자에 관리자가 없다면 관리자 정보 조회
+        if (!myInfo.getRole().equals(ChatMemberRole.ADMIN) || recentParticipants.stream().noneMatch(participant -> participant.role().equals(ChatMemberRole.ADMIN))) {
             ChatMemberResult.Detail admin = chatMemberService.readAdmin(chatRoomId)
                     .orElseThrow(() -> new ChatMemberErrorException(ChatMemberErrorCode.NOT_FOUND));
             recentParticipantIds.add(admin.userId());