diff --git a/src/main/java/com/back/catchmate/domain/board/repository/BookMarkRepository.java b/src/main/java/com/back/catchmate/domain/board/repository/BookMarkRepository.java index d48d93d..9e5e8f0 100644 --- a/src/main/java/com/back/catchmate/domain/board/repository/BookMarkRepository.java +++ b/src/main/java/com/back/catchmate/domain/board/repository/BookMarkRepository.java @@ -12,7 +12,7 @@ public interface BookMarkRepository extends JpaRepository { boolean existsByUserAndBoardAndDeletedAtIsNull(User user, Board board); - Optional findByUserIdAndBoardId(Long userId, Long boardId); + Optional findByUserIdAndBoardIdAndDeletedAtIsNull(Long userId, Long boardId); Page findAllByUserIdAndDeletedAtIsNull(Long userId, Pageable pageable); } diff --git a/src/main/java/com/back/catchmate/domain/board/service/BookMarkServiceImpl.java b/src/main/java/com/back/catchmate/domain/board/service/BookMarkServiceImpl.java index a8f4ec4..40f0d04 100644 --- a/src/main/java/com/back/catchmate/domain/board/service/BookMarkServiceImpl.java +++ b/src/main/java/com/back/catchmate/domain/board/service/BookMarkServiceImpl.java @@ -69,7 +69,7 @@ public StateResponse removeBookMark(Long userId, Long boardId) { Board board = boardRepository.findById(boardId) .orElseThrow(() -> new BaseException(ErrorCode.BOARD_NOT_FOUND)); - BookMark bookMark = bookMarkRepository.findByUserIdAndBoardId(user.getId(), board.getId()) + BookMark bookMark = bookMarkRepository.findByUserIdAndBoardIdAndDeletedAtIsNull(user.getId(), board.getId()) .orElseThrow(() -> new BaseException(ErrorCode.BOOKMARK_NOT_FOUND)); bookMark.delete();