Merge pull request #8 from AlgorithmChef/feature/update-database

데이터 베이스 구조 변경 및 레시피 평점 매기는 로직 완성

Author: Kim-buyeon

src/main/java/com/webservice/algorithmchef/controller/RecipeReviewController.java

@@ -0,0 +1,35 @@
+package com.webservice.algorithmchef.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.webservice.algorithmchef.dto.recipereview.RecipeReviewRequest;
+import com.webservice.algorithmchef.dto.recipereview.RecipeReviewResponse;
+import com.webservice.algorithmchef.service.RecipeReviewService;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class RecipeReviewController {
+	
+	private final RecipeReviewService rService;
+	
+	@PostMapping("/recipe/review")
+	public ResponseEntity<?> makeReview(@RequestBody RecipeReviewRequest request,
+			@AuthenticationPrincipal UserDetails userDetails){
+		try {
+			String userId = userDetails.getUsername();
+			RecipeReviewResponse response = rService.makeReview(request, userId);
+			return ResponseEntity.status(HttpStatus.CREATED).body(response);
+		}catch (IllegalArgumentException e) {
+			return ResponseEntity.badRequest().body(e.getMessage());
+		}
+	}
+
+}

src/main/java/com/webservice/algorithmchef/dto/recipereview/RecipeReviewRequest.java

@@ -0,0 +1,13 @@
+package com.webservice.algorithmchef.dto.recipereview;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class RecipeReviewRequest {
+
+	private String name;
+	private float rating;
+	private String content;
+}

src/main/java/com/webservice/algorithmchef/dto/recipereview/RecipeReviewResponse.java

@@ -0,0 +1,21 @@
+package com.webservice.algorithmchef.dto.recipereview;
+
+import com.webservice.algorithmchef.model.RecipeReview;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class RecipeReviewResponse {
+
+	private String name;
+	private String userId;
+	private float rating;
+	
+	public RecipeReviewResponse(RecipeReview review) {
+		this.name = review.getRecipe().getName();
+		this.userId = review.getUser().getUserId();
+		this.rating = review.getRating();
+	}
+}

src/main/java/com/webservice/algorithmchef/model/Ingredient.java

@@ -46,7 +46,4 @@ public class Ingredient {
 	@OneToMany(mappedBy = "ingredient",orphanRemoval = true,cascade = CascadeType.ALL)
 	private List<FridgeIngredient> ingredients;
 
-	@OneToMany(mappedBy = "ingredient",orphanRemoval = true,cascade = CascadeType.ALL)
-	private List<RecipeIngredient> recipeIngredients;
-	
 }

src/main/java/com/webservice/algorithmchef/model/Recipe.java

@@ -30,7 +30,7 @@ public class Recipe {
 	@Column(name="recipe_id")
 	private Long id;
 
-	@Column(nullable = false, unique = true)
+	@Column(nullable = false)
 	private String name;
 
 	@Lob
@@ -45,14 +45,24 @@ public class Recipe {
 	@Column(nullable = false)
 	private String type;
 
+	@Column(nullable = false)
+	@Lob
+	private String neededIngredients;
+	
 	@Column(nullable = false)
 	private double kcal;
 
-	@OneToMany(mappedBy = "recipe", orphanRemoval = true)
-	private List<RecipeTag> recipeTags;
+	@Column
+	private String tag;
 
-	@OneToMany(mappedBy = "recipe", orphanRemoval = true)
-	private List<RecipeIngredient> recipeIngredients;
+	@Column
+	private String portions;
+	
+	@Column
+	private String time;
+	
+	@Column
+	private String tip;
 
 	@OneToMany(mappedBy = "recipe", orphanRemoval = true)
 	private List<RecipeReview> recipeReviews;

src/main/java/com/webservice/algorithmchef/model/RecipeIngredient.java

@@ -11,6 +11,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
 import jakarta.persistence.ManyToOne;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -44,6 +45,10 @@ public class RecipeReview {
 	@Column(nullable = false)
 	private float rating;
 
+	@Column
+	@Lob
+	private String content;
+	
 	@CreationTimestamp
 	private LocalDateTime createdAt;
 

src/main/java/com/webservice/algorithmchef/model/RecipeReview.java

@@ -0,0 +1,12 @@
+package com.webservice.algorithmchef.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.webservice.algorithmchef.model.Recipe;
+
+public interface RecipeRepository extends JpaRepository<Recipe, Long>{
+
+	public Optional<Recipe> findByName(String name);
+}