[feat] 레시피 삭제 로직 리팩터링 및 MemberRecipe 기반 삭제 API 추가

Author: username056

yechef/src/main/java/sejong/capston/yechef/domain/MemberRecipe/controller/MemberRecipeController.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -52,6 +53,15 @@ public ResponseEntity<RecipeDto> getRecipeFromMemberRecipe(
     return ResponseEntity.ok(recipeService.getRecipeFromMemberRecipe(memberRecipeId));
   }
 
+  @DeleteMapping("/members/{memberId}/member-recipes/{memberRecipeId}")
+  public ResponseEntity<Void> deleteMemberRecipe(
+      @PathVariable("memberId") Long memberId,
+      @PathVariable("memberRecipeId") Long memberRecipeId
+  ) {
+    recipeService.deleteMemberRecipe(memberId, memberRecipeId);
+    return ResponseEntity.noContent().build();
+  }
+
 }
 
 

yechef/src/main/java/sejong/capston/yechef/domain/MemberRecipe/repository/MemberRecipeRepository.java

@@ -15,5 +15,6 @@ public interface MemberRecipeRepository extends JpaRepository<MemberRecipe, Long
   @Query("SELECT mr.recipe FROM MemberRecipe mr WHERE mr.member.id = :memberId AND mr.isLiked = true")
   List<Recipe> findLikedRecipesByMemberId(@Param("memberId") Long memberId);
 
+  long countByRecipeId(Long recipeId);
 }
 

yechef/src/main/java/sejong/capston/yechef/domain/Recipe/controller/RecipeController.java

@@ -32,7 +32,7 @@ public class RecipeController {
     @PostMapping(value = "/{memberId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<RecipeDto> createRecipe(
             @Parameter(description = "회원 ID", required = true)
-            @PathVariable Long memberId,
+            @PathVariable("memberId") Long memberId,
 
             @Parameter(description = "GPT 파싱 결과 JSON (문자열 형태)", required = true)
             @RequestPart("dto") String dtoText,  // String으로 먼저 받음
@@ -59,23 +59,21 @@ public ResponseEntity<RecipeDto> createRecipe(
     @GetMapping("/{recipeId}")
   public ResponseEntity<RecipeDto> getRecipe(
           @Parameter(description = "조회할 레시피 ID", required = true)
-          @PathVariable Long recipeId
+          @PathVariable("recipeId") Long recipeId
   ) {
     return ResponseEntity.ok(recipeService.getRecipe(recipeId));
   }
 
-  @DeleteMapping("/{recipeId}")
+  @DeleteMapping("/members/{memberId}/recipes/{recipeId}")
   public ResponseEntity<Void> deleteRecipe(
-          @Parameter(description = "사용자 ID (테스트용)", required = true)
-          @RequestParam Long memberId,
-
-          @Parameter(description = "삭제할 레시피 ID", required = true)
-          @PathVariable Long recipeId
+      @PathVariable("memberId") Long memberId,
+      @PathVariable("recipeId") Long recipeId
   ) {
     recipeService.delete(memberId, recipeId);
     return ResponseEntity.noContent().build();
   }
-  
+
+
   @GetMapping("/public")
   public ResponseEntity<List<Recipe>> getPublicRecipes() {
     return ResponseEntity.ok(recipeService.getPublicRecipes());

yechef/src/main/java/sejong/capston/yechef/domain/Recipe/controller/RecipeProgressController.java

@@ -20,9 +20,9 @@ public class RecipeProgressController {
 
   @PostMapping("/{recipeId}/step/{stepNumber}/progress")
   public RecipeStepDto progressStep(
-      @PathVariable Long memberId,
-      @PathVariable Long recipeId,
-      @PathVariable int stepNumber,
+      @PathVariable("memberId") Long memberId,
+      @PathVariable("recipeId") Long recipeId,
+      @PathVariable("stepNumber") int stepNumber,
       @RequestBody VoiceInputDto input
   ) {
     return progressService.processStep(memberId, recipeId, stepNumber, input.getText());

yechef/src/main/java/sejong/capston/yechef/domain/Recipe/service/RecipeService.java

@@ -69,7 +69,6 @@ public RecipeDto create(Long memberId, RecipeParseResultDto recipeDto, Multipart
 
     // MemberRecipe 연결
     MemberRecipe memberRecipe = MemberRecipe.of(member, recipe);
-    memberRecipeRepository.save(memberRecipe);
 
     // Member 연결
     memberRecipeRepository.save(memberRecipe);
@@ -99,27 +98,40 @@ public RecipeDto getRecipe(Long recipeId) {
 
   @Transactional
   public void delete(Long memberId, Long recipeId) {
+    // 1. 현재 사용자의 MemberRecipe 조회
     MemberRecipe memberRecipe = memberRecipeRepository.findByMemberIdAndRecipeId(memberId, recipeId)
         .orElseThrow(() -> BaseException.from(ErrorCode.NOT_RECIPE_OWNER));
 
     Recipe recipe = memberRecipe.getRecipe();
 
-    // 1. 썸네일 이미지 삭제
-    if (recipe.getThumbnailImage() != null) {
-      String thumbnailKey = recipe.getThumbnailImage().getS3Key();
-      if (thumbnailKey != null) {
-        s3UploadService.deleteFile(thumbnailKey);
+    // 2. MemberRecipe 삭제
+    memberRecipeRepository.delete(memberRecipe);
+
+    // 3. 해당 recipe가 다른 멤버에게 공유되지 않았다면 실제로 삭제
+    long remainingLinks = memberRecipeRepository.countByRecipeId(recipeId);
+    if (remainingLinks == 0) {
+      // 3-1. 썸네일 S3 삭제
+      if (recipe.getThumbnailImage() != null) {
+        String thumbnailKey = recipe.getThumbnailImage().getS3Key();
+        if (thumbnailKey != null) {
+          s3UploadService.deleteFile(thumbnailKey);
+        }
       }
+
+      // 3-2. 원본 이미지 S3 삭제
+      if (recipe.getSourceImage() != null) {
+        String sourceKey = recipe.getSourceImage().getS3Key();
+        if (sourceKey != null) {
+          s3UploadService.deleteFile(sourceKey);
+        }
+      }
+
+      // 3-3. 레시피 삭제 (Image는 cascade + orphanRemoval)
+      recipeRepository.delete(recipe);
     }
-    
-    // 2. 사용자 원본 이미지 삭제
-    if (recipe.getSourceImage() != null) {
-      s3UploadService.deleteFile(recipe.getSourceImage().getS3Key());
-    }
-    // 3. 레시피 삭제 (Image는 cascade + orphanRemoval로 자동 삭제됨)
-    recipeRepository.delete(recipe);
   }
 
+
   @Transactional
   public void toggleLike(Long memberId, Long recipeId) {
     Member member = memberRepository.findById(memberId)
@@ -159,4 +171,46 @@ public List<Recipe> getPublicRecipes() {
     return recipeRepository.findByRecipeType(Recipe.RecipeType.PUBLIC);
   }
 
+  @Transactional(readOnly = true)
+  public RecipeDto getRecipeFromMemberRecipe(Long memberRecipeId) {
+    MemberRecipe mr = memberRecipeRepository.findById(memberRecipeId)
+        .orElseThrow(() -> BaseException.from(ErrorCode.MEMBER_RECIPE_NOT_FOUND));
+
+    return RecipeDto.from(mr.getRecipe());
+  }
+
+  @Transactional
+  public void deleteMemberRecipe(Long memberId, Long memberRecipeId) {
+    MemberRecipe memberRecipe = memberRecipeRepository.findById(memberRecipeId)
+        .orElseThrow(() -> BaseException.from(ErrorCode.MEMBER_RECIPE_NOT_FOUND));
+
+    // 다른 사람이 요청한 경우 차단
+    if (!memberRecipe.getMember().getId().equals(memberId)) {
+      throw BaseException.from(ErrorCode.NOT_RECIPE_OWNER);
+    }
+
+    Recipe recipe = memberRecipe.getRecipe();
+
+    // 좋아요만 누른 경우 → 연결만 삭제
+    if (!memberRecipe.getIsOwner()) {
+      memberRecipeRepository.delete(memberRecipe);
+      return;
+    }
+
+    // 소유자인 경우 → 연결 삭제 후 레시피 사용 여부 확인
+    memberRecipeRepository.delete(memberRecipe);
+
+    long count = memberRecipeRepository.countByRecipeId(recipe.getId());
+    if (count == 0) {
+      if (recipe.getThumbnailImage() != null) {
+        s3UploadService.deleteFile(recipe.getThumbnailImage().getS3Key());
+      }
+      if (recipe.getSourceImage() != null) {
+        s3UploadService.deleteFile(recipe.getSourceImage().getS3Key());
+      }
+
+      recipeRepository.delete(recipe);
+    }
+  }
+
 }

yechef/src/main/java/sejong/capston/yechef/domain/RecipeSteps/RecipeStep.java

@@ -6,14 +6,15 @@
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.SQLRestriction;
 import sejong.capston.yechef.domain.Recipe.Recipe;
+import sejong.capston.yechef.global.entity.BaseEntity;
 
 @Getter
 @Setter
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SQLDelete(sql = "UPDATE recipe_step SET is_deleted = true, deleted_at = now() where id = ?")
 @SQLRestriction("is_deleted is FALSE")
-public class RecipeStep {
+public class RecipeStep extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

yechef/src/main/java/sejong/capston/yechef/domain/RecipeSteps/repository/RecipeStepRepository.java

@@ -2,9 +2,11 @@
 
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import sejong.capston.yechef.domain.MemberRecipe.MemberRecipe;
 import sejong.capston.yechef.domain.Recipe.Recipe;
 import sejong.capston.yechef.domain.RecipeSteps.RecipeStep;
 
 public interface RecipeStepRepository extends JpaRepository<RecipeStep, Long> {
   Optional<RecipeStep> findByRecipeAndStepNumber(Recipe recipe, int stepNumber);
-}
+  long countByRecipeId(Long recipeId);
+}