13 재료기반 레시피 조회

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,37 @@
+package moja.refrigerator.aggregate.recipe;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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_step_source_pk")
+    private RecipeStepSource recipeStepSource;
+
+    @ManyToOne
+    @JoinColumn(name = "recipe_pk")
+    @JsonBackReference
+    private Recipe recipe;
+
+}

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

@@ -0,0 +1,41 @@
+package moja.refrigerator.aggregate.recipe;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@Entity
+@Table(name="tbl_recipe_step_source")
+public class RecipeStepSource {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "recipe_step_source_pk")
+    private long recipeStepSourcePk;
+
+    @Column(name = "recipe_step_source_save") // 저장위치
+    private String recipeStepSourceSave;
+
+    @Column(name = "recipe_step_source_create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
+    private LocalDateTime recipeStepSourceCreateTime = LocalDateTime.now();
+
+    @Column(name = "recipe_step_source_file_name",nullable = false) // 저장 파일 명
+    private String recipeStepSourceFileName;
+
+    @Column(name = "recipe_step_source_servername") // 서버 저장한 이름 추가.
+    private String recipeStepSourceServername;
+
+    @JoinColumn(name = "recipe_step_source_type") // 자료타입 동영상 or 사진
+    @ManyToOne
+    private RecipeSourceType recipeStepSourceType;
+
+    @JsonBackReference
+    @OneToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name="recipe_step_pk")
+    private RecipeStep recipeStep;
+}

refrigerator/src/main/java/moja/refrigerator/aggregate/user/Follow.java

@@ -12,11 +12,11 @@ public class Follow {
     @Column(name = "follow_pk")
     private long followPk;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "follower")
     private User follower;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "following")
     private User following;
 }

refrigerator/src/main/java/moja/refrigerator/aggregate/user/User.java

@@ -5,6 +5,7 @@
 import org.hibernate.annotations.CreationTimestamp;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Entity
 @Table(name = "tbl_user")
@@ -33,4 +34,10 @@ public class User {
 
     @Column(name = "user_role")
     private String userRole = "ROLE_USER";
+
+    @OneToMany(mappedBy = "follower", cascade = CascadeType.REMOVE)
+    private List<Follow> following;
+
+    @OneToMany(mappedBy = "following", cascade = CascadeType.REMOVE)
+    private List<Follow> followers;
 }

refrigerator/src/main/java/moja/refrigerator/config/WebConfig.java

@@ -0,0 +1,18 @@
+package moja.refrigerator.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("http://localhost:5173")
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
+                .allowedHeaders("*")
+                .allowCredentials(true)
+                .maxAge(3600);
+    }
+}

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

@@ -27,12 +27,15 @@ public RecipeController(RecipeService recipeService) {
     }
 
     @PostMapping
-    public void createRecipe(
+    public Recipe 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
+
+        return recipeService.createRecipe(request
+                , recipeSources
+                , recipeStepSources
         );
     }
 
@@ -50,11 +53,12 @@ public void deleteRecipe(@RequestParam long recipePk){
     }
 
     @PutMapping
-    public void updateRecipe(
+    public Recipe 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);
+        return recipeService.updateRecipe(request,recipeSources,recipeStepSources);
     }
 
     @GetMapping("/recommend")

refrigerator/src/main/java/moja/refrigerator/controller/user/UserController.java

@@ -1,5 +1,7 @@
 package moja.refrigerator.controller.user;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import moja.refrigerator.dto.user.request.PasswordResetRequest;
 import moja.refrigerator.dto.user.request.PasswordUpdateRequest;
 import moja.refrigerator.dto.user.request.UserCreateRequest;
@@ -60,4 +62,11 @@ public ResponseEntity<?> toggleFollow(@PathVariable Long userPk) {
         followService.toggleFollow(userPk);
         return ResponseEntity.ok().body("팔로우 상태가 변경되었습니다.");
     }
+
+    // 회원 탈퇴
+    @PostMapping("/delete")
+    public ResponseEntity<?> delete(HttpServletRequest request, HttpServletResponse response) {
+        userService.deleteUser(request, response);
+        return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
+    }
 }

refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/IngredientResponse.java

@@ -13,6 +13,10 @@ public class IngredientResponse {
     private long remainExpirationDate;
     private int seasonDate;
     private String ingredientStorage;
+    private long ingredientManagementPk;
+    private boolean isBookmarked;
+    private String ingredientCategory;
+    private long ingredientBookmarkPk;
 
     // ModelMapper 를 위한 기본 생성자 생성
     public IngredientResponse() {}

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/RecipeStepSourceRequest.java

@@ -0,0 +1,18 @@
+package moja.refrigerator.dto.recipe.request;
+
+import lombok.Data;
+import moja.refrigerator.aggregate.recipe.RecipeSourceType;
+
+import java.time.LocalDateTime;
+
+@Data
+public class RecipeStepSourceRequest {
+        private long recipeStepSourcePk;
+        private String recipeStepSourceSave;
+        private LocalDateTime recipeStepSourceCreateTime;
+        private String recipeStepSourceFileName;
+        private String recipeStepSourceServername;
+        private RecipeSourceType recipeStepSourceType;
+
+
+}

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

@@ -0,0 +1,11 @@
+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와 일치
+    private RecipeStepSourceRequest recipeStepSource;
+}

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/RecipeDetailResponse.java

@@ -4,6 +4,7 @@
 import java.util.List;
 
 import lombok.Data;
+import moja.refrigerator.aggregate.recipe.RecipeSource;
 import moja.refrigerator.dto.ingredient.response.IngredientResponse;
 
 @Data
@@ -17,9 +18,10 @@ public class RecipeDetailResponse {
     private LocalDateTime recipeCreateTime;;
     private LocalDateTime recipeUpdateTime;
 
-    private String recipeSource;
+    private List<RecipeSource> recipeSource;
     private String userPk;
     private String recipeCategory;
 
     private List<IngredientResponse> ingredients;
+    private List<RecipeStepResponse> recipeStep;
 }

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

@@ -14,4 +14,7 @@ public class RecipeRecommendResponse {
     private long remainExpirationDays;
     private String urgentIngredientName;
     private List<RecipeIngredientInfo> ingredients;
+
+    private List<RecipeSourceInfo> mainImages;     // 메인 이미지들
+    private List<RecipeStepWithImage> steps;
 }

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,8 @@ public class RecipeResponse {
     private LocalDateTime recipeUpdateTime;
 
     private List<RecipeSource> recipeSource;
+
+    private List<RecipeStepResponse> recipeStep;
     private User user;
     private RecipeCategory recipeCategory;
 

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

@@ -0,0 +1,9 @@
+package moja.refrigerator.dto.recipe.response;
+
+import lombok.Data;
+
+@Data
+public class RecipeSourceInfo {
+    private String filePath;
+    private String originalName;
+}