북마크 삭제 기능 수정 (#78)

- Store와 Member 정보를 통해 삭제하도록 수정
Dongpo-App · Oct 7, 2024 · e66a68a · e66a68a
1 parent 47b6cf4
commit e66a68a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/com/dongyang/dongpo/controller/bookmark/BookmarkController.java b/src/main/java/com/dongyang/dongpo/controller/bookmark/BookmarkController.java
@@ -26,10 +26,11 @@ public ResponseEntity<ApiResponse<String>> addBookmark(@RequestBody Map<String,
         return ResponseEntity.ok(new ApiResponse<>("success"));
     }
 
-    @DeleteMapping("/{id}")
-    public ResponseEntity<ApiResponse<String>> deleteBookmark(@PathVariable Long id,
+    @DeleteMapping("/{storeId}")
+    @Operation(summary = "북마크 제거")
+    public ResponseEntity<ApiResponse<String>> deleteBookmark(@PathVariable Long storeId,
                                                               @AuthenticationPrincipal Member member) {
-        bookmarkService.deleteBookmark(id, member);
+        bookmarkService.deleteBookmark(storeId, member);
         return ResponseEntity.ok(new ApiResponse<>("success"));
     }
 }
diff --git a/src/main/java/com/dongyang/dongpo/repository/bookmark/BookmarkRepository.java b/src/main/java/com/dongyang/dongpo/repository/bookmark/BookmarkRepository.java
@@ -7,11 +7,14 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface BookmarkRepository extends JpaRepository<StoreBookmark, Long> {
     List<StoreBookmark> findByMemberId(Long id);
 
     List<StoreBookmark> findByMember(Member member);
 
+    Optional<StoreBookmark> findByStoreAndMember(Store store, Member member);
+
     boolean existsByStoreAndMember(Store store, Member member);
 }
diff --git a/src/main/java/com/dongyang/dongpo/service/bookmark/BookmarkService.java b/src/main/java/com/dongyang/dongpo/service/bookmark/BookmarkService.java
@@ -54,12 +54,14 @@ public List<BookmarkDto> getMyBookmarks(Member member) {
     }
 
     @Transactional
-    public void deleteBookmark(Long id, Member member) {
-        StoreBookmark bookmark = bookmarkRepository.findById(id)
+    public void deleteBookmark(Long storeId, Member member) {
+        Store store = storeRepository.findById(storeId)
+                .orElseThrow(() -> new CustomException(ErrorCode.STORE_NOT_FOUND));
+        StoreBookmark bookmark = bookmarkRepository.findByStoreAndMember(store, member)
                 .orElseThrow(() -> new CustomException(ErrorCode.BOOKMARK_NOT_FOUND));
 
         bookmarkRepository.delete(bookmark);
-        log.info("Member Id : {} is Delete Bookmark Id : {}", member.getId(), id);
+        log.info("Member {} deleted Bookmark : storeId -> {}", member.getEmail(), storeId);
     }
 
     public boolean isStoreBookmarkedByMember(Store store, Member member) {