Merge pull request #230 from CaZaIt/refactor/favorites

즐겨찾기 삭제 로직 리팩토링
CaZaIt · Mar 2, 2023 · 0c7f819 · 0c7f819
2 parents d1e5a26 + b9989c9
commit 0c7f819
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/shop/cazait/domain/favorites/api/FavoritesApiController.java b/src/main/java/shop/cazait/domain/favorites/api/FavoritesApiController.java
@@ -58,10 +58,13 @@ public SuccessResponse<List<GetFavoritesRes>> getFavorites(@PathVariable Long us
     }
 
     @Operation(summary = "즐겨찾기 삭제", description = "즐겨찾기 ID를 받아 즐겨찾기를 삭제한다.")
-    @Parameter(name = "favoritesId", description = "즐겨찾기 ID")
-    @DeleteMapping("/delete/{favoritesId}")
-    public SuccessResponse<String> deleteFavorites(@PathVariable(name = "favoritesId") Long favoritesId) {
-        return new SuccessResponse<>(SUCCESS, favoritesService.deleteFavorites(favoritesId));
+    @Parameters({
+            @Parameter(name= "userId", description = "즐겨찾기 ID"),
+            @Parameter(name= "cafeId", description = "즐겨찾기 ID")
+    })
+    @DeleteMapping("/delete/{userId}/{cafeId}")
+    public SuccessResponse<String> deleteFavorites(@PathVariable Long userId, @PathVariable Long cafeId) {
+        return new SuccessResponse<>(SUCCESS, favoritesService.deleteFavorites(userId, cafeId));
     }
 
 }
diff --git a/src/main/java/shop/cazait/domain/favorites/repository/FavoritesRepository.java b/src/main/java/shop/cazait/domain/favorites/repository/FavoritesRepository.java
@@ -7,6 +7,7 @@
 
 public interface FavoritesRepository extends JpaRepository<Favorites, Long> {
 
-    Optional<List<Favorites>> findAllByUserId(Long userId);
+    Optional<Favorites> findAllByUserIdAndCafeId(Long userId, Long cafeId);
 
+    Optional<List<Favorites>> findAllByUserId(Long userId);
 }
diff --git a/src/main/java/shop/cazait/domain/favorites/service/FavoritesService.java b/src/main/java/shop/cazait/domain/favorites/service/FavoritesService.java
@@ -83,10 +83,10 @@ public List<GetFavoritesRes> getFavorites(Long userId) {
     /**
      * 즐겨찾기 삭제
      */
-    public String deleteFavorites(Long favoritesId) {
+    public String deleteFavorites(Long userId, Long cafeId) {
 
         Favorites favorites = favoritesRepository
-                .findById(favoritesId)
+                .findAllByUserIdAndCafeId(userId, cafeId)
                 .orElseThrow(() -> new FavoritesException(NOT_EXIST_FAVORITES));
 
         favoritesRepository.delete(favorites);