Skip to content

Commit f2cbd4b

Browse files
committed
hotfix : 채팅방 조회 쿼리 수정
1 parent 1a970e4 commit f2cbd4b

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

src/main/java/ita/tinybite/domain/chat/repository/ChatRoomMemberRepository.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import ita.tinybite.domain.chat.entity.ChatRoom;
44
import ita.tinybite.domain.chat.entity.ChatRoomMember;
5+
import ita.tinybite.domain.chat.enums.ChatRoomType;
56
import ita.tinybite.domain.user.entity.User;
67
import org.springframework.data.jpa.repository.JpaRepository;
78

@@ -13,4 +14,6 @@ public interface ChatRoomMemberRepository extends JpaRepository<ChatRoomMember,
1314
List<ChatRoomMember> findByUser(User user);
1415

1516
Optional<ChatRoomMember> findByChatRoomAndUser(ChatRoom chatRoom, User user);
17+
18+
Optional<ChatRoomMember> findByChatRoomAndUserAndChatRoom_Type(ChatRoom chatRoom, User user, ChatRoomType chatRoomType);
1619
}

src/main/java/ita/tinybite/domain/chat/service/ChatRoomService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public List<GroupChatRoomResDto> getGroupRooms() {
9090
String recentContent = recentMessage != null ? recentMessage.getContent() : null;
9191
String timeAgo = getTimeAgo(chatRoom.getCreatedAt());
9292

93-
ChatRoomMember chatRoomMember = chatRoomMemberRepository.findByChatRoomAndUser(chatRoom, user).orElseThrow();
93+
ChatRoomMember chatRoomMember = chatRoomMemberRepository.findByChatRoomAndUserAndChatRoom_Type(chatRoom, user, ChatRoomType.GROUP).orElseThrow();
9494

9595
// 마지막으로 읽은 시점을 기점으로 몇 개의 메시지가 안 읽혔는지 확인
9696
long unreadCnt = chatMessageRepository.countByChatRoomIdAndCreatedAtAfterAndSenderIdNot(chatRoom.getId(), chatRoomMember.getLastReadAt(), user.getUserId());

0 commit comments

Comments
 (0)