Skip to content

fix: 어드민 유저가 채팅방을 나가도 목록에 조회되는 문제 해결 #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dh2906 merged 2 commits into from
Apr 4, 2026
+10 −6
Merged

fix: 어드민 유저가 채팅방을 나가도 목록에 조회되는 문제 해결 #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c774d
fix: 채팅방 목록 조회에서 채팅방을 나간 사용자 제외 조건 추가
dh2906 Apr 4, 2026
a749095
fix: 관리자 채팅방 나가기 시 목록에서 필터링 안되는 버그 수정
dh2906 Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/gg/agit/konect/domain/chat/repository/ChatRoomRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,16 @@ List<ChatRoom> findAllSystemAdminDirectRooms(
FROM ChatRoom cr
JOIN ChatRoomMember crm ON crm.id.chatRoomId = cr.id
JOIN User u ON u.id = crm.id.userId
JOIN ChatRoomMember adminCrm ON adminCrm.id.chatRoomId = cr.id
AND adminCrm.id.userId = :systemAdminId
JOIN ChatRoomMember systemAdminCrm ON systemAdminCrm.id.chatRoomId = cr.id
AND systemAdminCrm.id.userId = :systemAdminId
LEFT JOIN ChatRoomMember viewerAdminCrm ON viewerAdminCrm.id.chatRoomId = cr.id
AND viewerAdminCrm.id.userId = :viewerAdminId
LEFT JOIN ChatMessage cm ON cm.chatRoom.id = cr.id
AND cm.sender.id <> :systemAdminId
AND cm.createdAt > adminCrm.lastReadAt
AND cm.createdAt > systemAdminCrm.lastReadAt
WHERE cr.roomType = :roomType
AND u.role != :adminRole
AND (viewerAdminCrm.leftAt IS NULL OR viewerAdminCrm.id.userId IS NULL)
AND EXISTS (
SELECT 1 FROM ChatMessage userReply
JOIN userReply.sender userSender
Expand All @@ -188,6 +191,7 @@ ORDER BY COALESCE(cr.lastMessageSentAt, cr.createdAt) DESC
""")
List<AdminChatRoomProjection> findAdminChatRoomsOptimized(
@Param("systemAdminId") Integer systemAdminId,
@Param("viewerAdminId") Integer viewerAdminId,
@Param("adminRole") UserRole adminRole,
@Param("roomType") ChatType roomType
);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gg/agit/konect/domain/chat/service/ChatService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ private List<ChatRoomSummaryResponse> getDirectChatRooms(Integer userId) {
User user = userRepository.getById(userId);

if (user.getRole() == UserRole.ADMIN) {
return getAdminDirectChatRooms();
return getAdminDirectChatRooms(userId);
}

List<ChatRoomSummaryResponse> roomSummaries = new ArrayList<>();
Expand Down Expand Up @@ -525,9 +525,9 @@ private List<ChatRoomSummaryResponse> getDirectChatRooms(Integer userId) {
return roomSummaries;
}

private List<ChatRoomSummaryResponse> getAdminDirectChatRooms() {
private List<ChatRoomSummaryResponse> getAdminDirectChatRooms(Integer adminUserId) {
List<AdminChatRoomProjection> projections = chatRoomRepository.findAdminChatRoomsOptimized(
SYSTEM_ADMIN_ID, UserRole.ADMIN, ChatType.DIRECT
SYSTEM_ADMIN_ID, adminUserId, UserRole.ADMIN, ChatType.DIRECT
);

return projections.stream()
Expand Down
Loading