#26 레시피 front 를 위한 recipe 수정

refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Recipe.java

@@ -56,6 +56,10 @@ public class Recipe {
     @JsonManagedReference
     private List<RecipeSource> recipeSource = new ArrayList<>() ; // 여러 Source가 들어갈 수 있으니까 list로 수정
 
+    @OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.LAZY)
+    @JsonManagedReference
+    private List<RecipeStep> recipeStep = new ArrayList<>();
+
 
     @JoinColumn(name = "recipe_category")
     @ManyToOne

refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java

@@ -8,6 +8,7 @@
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @Entity

refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeStep.java

@@ -0,0 +1,36 @@
+package moja.refrigerator.aggregate.recipe;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Entity
+@Table(name = "tbl_recipe_step")
+public class RecipeStep {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "recipe_step_pk")
+    private long recipeStepPk;
+
+    @Column(name = "recipe_step_order")
+    private int recipeStepOrder;
+
+    @Column(name = "recipe_step_content")
+    private String recipeStepContent;
+
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JsonManagedReference
+    @JoinColumn(name = "recipe_Source_pk")
+    private RecipeSource recipeSources;
+
+    @ManyToOne
+    @JoinColumn(name = "recipe_pk")
+    @JsonBackReference
+    private Recipe recipe;
+
+}

refrigerator/src/main/java/moja/refrigerator/controller/recipe/RecipeController.java

@@ -29,10 +29,13 @@ public RecipeController(RecipeService recipeService) {
     @PostMapping
     public void createRecipe(
             @RequestPart RecipeCreateRequest request
-            , @RequestPart (required =false) List<MultipartFile> files
+            ,@RequestPart (name="recipeSources",required =false) List<MultipartFile> recipeSources
+            ,@RequestPart (name="recipeStepSources",required =false) List<MultipartFile> recipeStepSources
     ){
+
         recipeService.createRecipe(request
-                , files
+                , recipeSources
+                , recipeStepSources
         );
     }
 
@@ -52,9 +55,10 @@ public void deleteRecipe(@RequestParam long recipePk){
     @PutMapping
     public void updateRecipe(
             @RequestPart RecipeUpdateRequest request
-            ,@RequestPart (required =false) List<MultipartFile> files
+            ,@RequestPart (name="recipeSources",required =false) List<MultipartFile> recipeSources
+            ,@RequestPart (name="recipeStepSources",required =false) List<MultipartFile> recipeStepSources
     ){
-        recipeService.updateRecipe(request,files);
+        recipeService.updateRecipe(request,recipeSources,recipeStepSources);
     }
 
     @GetMapping("/recommend")

refrigerator/src/main/java/moja/refrigerator/dto/recipe/request/RecipeCreateRequest.java

@@ -1,22 +1,18 @@
 package moja.refrigerator.dto.recipe.request;
 
 import lombok.Data;
-import moja.refrigerator.aggregate.recipe.RecipeCategory;
-import moja.refrigerator.aggregate.recipe.RecipeSource;
-import moja.refrigerator.aggregate.user.User;
+import moja.refrigerator.aggregate.recipe.RecipeStep;
+
+import java.util.List;
 
 @Data
 public class RecipeCreateRequest {
     private String recipeName;
     private int recipeCookingTime;
     private int recipeDifficulty;
     private String recipeContent;
-//    private long recipeSource;
     private int recipeCategoryPk;
+    private List<RecipeStepRequest> recipeSteps;
     private long userPk;
 
-//    private long recipePk; // 자동 추가
-//    private String recipeCreateTime; //자동 추가
-//    private String recipeUpdateTime; //자동 추가
-//    private long recipeViews; // 조회 시 올리는 것으로
 }

refrigerator/src/main/java/moja/refrigerator/dto/recipe/request/RecipeStepRequest.java

@@ -0,0 +1,9 @@
+package moja.refrigerator.dto.recipe.request;
+
+import lombok.Data;
+
+@Data
+public class RecipeStepRequest {
+    private int recipeStepOrder; // JSON에 있는 필드와 이름 동일해야 함
+    private String recipeStepContent; // JSON의 recipeStepContent와 일치
+}

refrigerator/src/main/java/moja/refrigerator/dto/recipe/request/RecipeStepUpdateRequest.java

@@ -0,0 +1,10 @@
+package moja.refrigerator.dto.recipe.request;
+
+import lombok.Data;
+
+@Data
+public class RecipeStepUpdateRequest {
+    private Long recipeStepPk;
+    private int recipeStepOrder; // JSON에 있는 필드와 이름 동일해야 함
+    private String recipeStepContent; // JSON의 recipeStepContent와 일치
+}

refrigerator/src/main/java/moja/refrigerator/dto/recipe/request/RecipeUpdateRequest.java

@@ -3,6 +3,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class RecipeUpdateRequest {
     private long recipePk;
@@ -13,5 +15,6 @@ public class RecipeUpdateRequest {
     private String recipeSource;
     private String recipeCategory;
     private String userPk;
+    private List<RecipeStepUpdateRequest> recipeSteps;
 
 }

refrigerator/src/main/java/moja/refrigerator/dto/recipe/response/RecipeResponse.java

@@ -3,6 +3,7 @@
 import lombok.Data;
 import moja.refrigerator.aggregate.recipe.RecipeCategory;
 import moja.refrigerator.aggregate.recipe.RecipeSource;
+import moja.refrigerator.aggregate.recipe.RecipeStep;
 import moja.refrigerator.aggregate.user.User;
 
 import java.time.LocalDateTime;
@@ -22,6 +23,7 @@ public class RecipeResponse {
     private LocalDateTime recipeUpdateTime;
 
     private List<RecipeSource> recipeSource;
+    private List<RecipeStep> recipeStep;
     private User user;
     private RecipeCategory recipeCategory;
 

refrigerator/src/main/java/moja/refrigerator/repository/recipe/RecipeStepRepository.java

@@ -0,0 +1,8 @@
+package moja.refrigerator.repository.recipe;
+
+import moja.refrigerator.aggregate.recipe.RecipeStep;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface RecipeStepRepository extends JpaRepository<RecipeStep, Long> {
+
+}

refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeService.java

@@ -16,14 +16,16 @@
 
 public interface RecipeService {
     void createRecipe(RecipeCreateRequest request
-            ,List<MultipartFile> files
+            ,List<MultipartFile> recipeSources
+            ,List<MultipartFile> recipeStepSources
     );
     List<RecipeResponse> getAllRecipes();
     RecipeDetailResponse getRecipe(long id);
     void deleteRecipe(long recipePk);
     void updateRecipe(
             RecipeUpdateRequest request
-            ,List<MultipartFile> files
+            ,List<MultipartFile> recipeSources
+            ,List<MultipartFile> recipeStepSources
     );
     List<RecipeRecommendResponse> getRecommendedRecipes(Long userPk);
     RecipeRecommendResponse getRandomRecipe();