♻️ ingredient, category change

woowacourse-teams · Oct 23, 2024 · 9470538 · 9470538
1 parent 77302ca
commit 9470538
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/backend/src/main/java/net/pengcook/recipe/controller/RecipeController.java b/backend/src/main/java/net/pengcook/recipe/controller/RecipeController.java
@@ -67,12 +67,13 @@ public RecipeResponse createRecipe(@LoginUser UserInfo userInfo, @RequestBody @V
         return recipeService.createRecipe(userInfo, recipeRequest);
     }
 
-    @PutMapping
+    @PutMapping("/{recipeId}")
     public void updateRecipe(
             @LoginUser UserInfo userInfo,
+            @PathVariable Long recipeId,
             @RequestBody @Valid RecipeUpdateRequest recipeUpdateRequest
     ) {
-        recipeService.updateRecipe(userInfo, recipeUpdateRequest);
+        recipeService.updateRecipe(userInfo, recipeId, recipeUpdateRequest);
     }
 
     @GetMapping("/{recipeId}")

diff --git a/backend/src/main/java/net/pengcook/recipe/dto/RecipeUpdateRequest.java b/backend/src/main/java/net/pengcook/recipe/dto/RecipeUpdateRequest.java
@@ -4,12 +4,10 @@
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import net.pengcook.ingredient.dto.IngredientCreateRequest;
 
 public record RecipeUpdateRequest(
-        @NotNull Long id,
         @NotBlank String title,
         @NotBlank String cookingTime,
         @NotBlank String thumbnail,

diff --git a/backend/src/main/java/net/pengcook/recipe/service/RecipeService.java b/backend/src/main/java/net/pengcook/recipe/service/RecipeService.java
@@ -170,10 +170,9 @@ public RecipeResponse createRecipe(UserInfo userInfo, RecipeRequest recipeReques
     }
 
     @Transactional
-    public void updateRecipe(UserInfo userInfo, RecipeUpdateRequest recipeUpdateRequest) {
-        User author = userRepository.findById(userInfo.getId()).orElseThrow();
-        Recipe recipe = recipeRepository.findById(userInfo.getId()).orElseThrow();
-        validateRecipeAuthor(author, recipe);
+    public void updateRecipe(UserInfo userInfo, Long recipeId, RecipeUpdateRequest recipeUpdateRequest) {
+        Recipe recipe = recipeRepository.findById(recipeId).orElseThrow();
+        verifyRecipeOwner(userInfo, recipe);
 
         Recipe updatedRecipe = recipe.updateRecipe(
                 recipeUpdateRequest.title(),
@@ -183,17 +182,16 @@ public void updateRecipe(UserInfo userInfo, RecipeUpdateRequest recipeUpdateRequ
                 recipeUpdateRequest.description()
         );
 
+        ingredientRecipeService.deleteIngredientRecipe(recipe.getId());
+        ingredientService.register(recipeUpdateRequest.ingredients(), updatedRecipe);
+        categoryService.deleteCategoryRecipe(recipe);
+        categoryService.saveCategories(updatedRecipe, recipeUpdateRequest.categories());
+
         recipeStepService.deleteRecipeStepsByRecipe(updatedRecipe.getId());
         recipeStepRepository.flush();
         recipeStepService.saveRecipeSteps(updatedRecipe.getId(), recipeUpdateRequest.recipeSteps());
     }
 
-    private void validateRecipeAuthor(User author, Recipe recipe) {
-        if (recipe.getAuthor().getId() != author.getId()) {
-            throw new UnauthorizedException("레시피를 수정할 수 없습니다.");
-        }
-    }
-
     @Transactional(readOnly = true)
     public RecipeDescriptionResponse readRecipeDescription(UserInfo userInfo, long recipeId) {
         List<RecipeDataResponse> recipeDataResponses = recipeRepository.findRecipeData(recipeId);
@@ -211,7 +209,7 @@ public void deleteRecipe(UserInfo userInfo, long recipeId) {
         Optional<Recipe> targetRecipe = recipeRepository.findById(recipeId);
 
         targetRecipe.ifPresent(recipe -> {
-            verifyUserCanDeleteRecipe(userInfo, recipe);
+            verifyRecipeOwner(userInfo, recipe);
             ingredientRecipeService.deleteIngredientRecipe(recipe.getId());
             categoryService.deleteCategoryRecipe(recipe);
             commentService.deleteCommentsByRecipe(recipe.getId());
@@ -261,9 +259,11 @@ private List<CategoryResponse> getCategoryResponses(List<RecipeDataResponse> gro
                 .collect(Collectors.toList());
     }
 
-    private void verifyUserCanDeleteRecipe(UserInfo userInfo, Recipe recipe) {
-        if (recipe.getAuthor().getId() != userInfo.getId()) {
-            throw new UnauthorizedException("레시피를 삭제할 수 없습니다.");
+    private void verifyRecipeOwner(UserInfo userInfo, Recipe recipe) {
+        User author = recipe.getAuthor();
+        long authorId = author.getId();
+        if (!userInfo.isSameUser(authorId)) {
+            throw new UnauthorizedException("레시피에 대한 권한이 없습니다.");
         }
     }
 }
diff --git a/backend/src/test/java/net/pengcook/recipe/controller/RecipeControllerTest.java b/backend/src/test/java/net/pengcook/recipe/controller/RecipeControllerTest.java
@@ -308,6 +308,7 @@ void createRecipe() {
     @WithLoginUser(email = "[email protected]")
     @DisplayName("레시피를 수정한다.")
     void updateRecipe() {
+        long recipeId = 1L;
         List<String> categories = List.of("Dessert", "NewCategory");
         List<String> substitutions = List.of("Water", "Orange");
         List<IngredientCreateRequest> ingredients = List.of(
@@ -319,7 +320,6 @@ void updateRecipe() {
                 new RecipeStepRequest(null, "스텝2 설명", 2, "00:20:00")
         );
         RecipeUpdateRequest recipeUpdateRequest = new RecipeUpdateRequest(
-                1L,
                 "변경된 레시피 제목",
                 "00:30:00",
                 "변경된 썸네일.jpg",
@@ -353,7 +353,7 @@ void updateRecipe() {
                         )))
                 .contentType(ContentType.JSON)
                 .body(recipeUpdateRequest)
-                .when().put("/recipes")
+                .when().put("/recipes/" + recipeId)
                 .then().log().all()
                 .statusCode(200);
     }

diff --git a/backend/src/test/java/net/pengcook/recipe/service/RecipeServiceTest.java b/backend/src/test/java/net/pengcook/recipe/service/RecipeServiceTest.java
@@ -109,9 +109,10 @@ void createRecipe() {
     }
 
     @Test
-    @DisplayName("새로운 레시피를 생성한다.")
+    @DisplayName("레시피를 수정한다.")
     void updateRecipe() {
         UserInfo userInfo = new UserInfo(1L, "[email protected]");
+        Long recipeId = 1L;
 
         List<String> categories = List.of("변경된 카테고리 1", "변경된 카테고리 2");
         List<String> substitutions = List.of("변경된 재료 1", "변경된 재료 2");
@@ -124,7 +125,6 @@ void updateRecipe() {
                 new RecipeStepRequest(null, "변경된 스텝2 설명", 2, "00:30:00")
         );
         RecipeUpdateRequest recipeUpdateRecipe = new RecipeUpdateRequest(
-                1L,
                 "변경된 제목",
                 "00:10:00",
                 "변경된 레시피 썸네일.jpg",
@@ -135,7 +135,7 @@ void updateRecipe() {
                 recipeStepRequests
         );
 
-        recipeService.updateRecipe(userInfo, recipeUpdateRecipe);
+        recipeService.updateRecipe(userInfo, recipeId, recipeUpdateRecipe);
 
         Recipe recipe = recipeRepository.findById(1L).orElseThrow();
         assertAll(