Skip to content

Commit 7be61ea

Browse files
committed
fix: Chatting bookmark create error fix
1 parent 633faeb commit 7be61ea

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

pocketpt/src/main/java/com/madeyepeople/pocketpt/domain/chattingMessage/repository/ChattingMessageRepository.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public interface ChattingMessageRepository extends JpaRepository<ChattingMessage
2525
""", nativeQuery = true)
2626
Optional<ChattingMessage> findLatestChattingMessageByRoom(Long chattingRoom);
2727

28-
// 삭제되지 않은 메시지
28+
// 삭제되지 않은 나의 메시지
2929
@Query(value=
3030
"""
3131
SELECT *
@@ -37,6 +37,17 @@ public interface ChattingMessageRepository extends JpaRepository<ChattingMessage
3737
""", nativeQuery = true)
3838
Optional<ChattingMessage> findByIdAndRoomIdAndAccountIdAndIsDeletedFalse(Long chattingRoom, Long account, Long chattingMessage);
3939

40+
// 삭제되지 않은 메시지
41+
@Query(value=
42+
"""
43+
SELECT *
44+
FROM chatting_message m
45+
WHERE m.chatting_room = :chattingRoom
46+
AND m.chatting_message_id = :chattingMessage
47+
AND is_deleted = FALSE
48+
""", nativeQuery = true)
49+
Optional<ChattingMessage> findByIdAndRoomIdAndIsDeletedFalse(Long chattingRoom, Long chattingMessage);
50+
4051
// 채팅방의 메시지 총개수
4152
@Query(value =
4253
"""

pocketpt/src/main/java/com/madeyepeople/pocketpt/domain/chattingMessageBookmark/service/ChattingMessageBookmarkService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public ResultResponse createChattingMessageBookmark(Long roomId, Long accountId,
6464
);
6565

6666
// [3] 메시지 유효성 검사
67-
ChattingMessage chattingMessage = chattingMessageRepository.findByIdAndRoomIdAndAccountIdAndIsDeletedFalse(roomId, accountId, chattingMessageId).orElseThrow(
67+
ChattingMessage chattingMessage = chattingMessageRepository.findByIdAndRoomIdAndIsDeletedFalse(roomId, chattingMessageId).orElseThrow(
6868
() -> new BusinessException(ErrorCode.CHATTING_MESSAGE_NOT_FOUND, CustomExceptionMessage.CHATTING_MESSAGE_NOT_FOUND.getMessage())
6969
);
7070

0 commit comments

Comments
 (0)