Develop

refrigerator/.gitignore

@@ -713,3 +713,6 @@ FodyWeavers.xsd
 
 # End of https://www.toptal.com/developers/gitignore/api/macos,windows,git,java,intellij,visualstudio,eclipse,gradle,netbeans
 /src/main/resources/application.yml
+
+.idea/
+*.iml

refrigerator/build.gradle

@@ -31,13 +31,19 @@ dependencies {
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
+	runtimeOnly 'com.mysql:mysql-connector-j'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
 	implementation 'org.modelmapper:modelmapper:3.1.0'
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
 }
-
 tasks.named('test') {
 	useJUnitPlatform()
 }

refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java

@@ -0,0 +1,24 @@
+package moja.refrigerator.aggregate.ingredient;
+
+import jakarta.persistence.*;
+import lombok.Data;
+import moja.refrigerator.aggregate.user.User;
+
+@Table(name = "tbl_ingredient_bookmark")
+@Entity
+@Data
+public class IngredientBookmark {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ingredient_bookmark_pk")
+    private long ingredientBookmarkPk;
+
+    @ManyToOne
+    @JoinColumn(name = "user_pk")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "ingredient_my_refrigerator_pk")
+    private IngredientMyRefrigerator ingredientMyRefrigerator;
+}

refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientCategory.java

@@ -0,0 +1,18 @@
+package moja.refrigerator.aggregate.ingredient;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Table(name = "tbl_ingredient_category")
+@Data
+public class IngredientCategory {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ingredient_category_pk")
+    private int ingredientCategoryPk;
+
+    @Column(name = "ingredient_category")
+    private String ingredientCategory;
+}

refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientManagement.java

@@ -0,0 +1,29 @@
+package moja.refrigerator.aggregate.ingredient;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name = "tbl_ingredient_management")
+public class IngredientManagement {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ingredient_management_pk")
+    private long ingredientManagementPk;
+
+    @Column(name = "ingredient_name")
+    private String ingredientName;
+
+    @Column(name = "season_date")
+    private int seasonDate;
+
+    @JoinColumn(name = "ingredient_category")
+    @ManyToOne
+    private IngredientCategory ingredientCategory;
+
+    @JoinColumn(name = "ingredient_storage")
+    @ManyToOne
+    private IngredientStorage ingredientStorage;
+}

refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientMyRefrigerator.java

@@ -0,0 +1,34 @@
+package moja.refrigerator.aggregate.ingredient;
+
+import jakarta.persistence.*;
+import lombok.Data;
+import moja.refrigerator.aggregate.user.User;
+
+@Data
+@Entity
+@Table(name = "tbl_ingredient_my_refrigerator")
+public class IngredientMyRefrigerator {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ingredient_my_refrigerator_pk")
+    private long ingredientMyRefrigeratorPk;
+
+    @ManyToOne
+    @JoinColumn(name = "user_pk")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "ingredient_management_pk")
+    private IngredientManagement ingredientManagement;
+
+    @Column(name = "expiration_date")
+    private String expirationDate;
+
+    @Column(name = "registration_date")
+    private String registrationDate;
+
+    @Column(name = "ingredient_amount")
+    private float ingredientAmount;
+
+}

refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java

@@ -0,0 +1,17 @@
+package moja.refrigerator.aggregate.ingredient;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name="tbl_ingredient_storage")
+public class IngredientStorage {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ingredient_storage_pk")
+    private int ingredientStoragePk;
+
+    @Column(name = "ingredient_storage")
+    private String ingredientStorage;
+}

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

@@ -0,0 +1,30 @@
+package moja.refrigerator.aggregate.recipe;
+
+import jakarta.persistence.*;
+import lombok.Data;
+import moja.refrigerator.aggregate.user.User;
+
+@Data
+@Entity
+@Table(name = "tbl_comment")
+public class Comment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "comment_pk")
+    private long commentPk ;
+
+    @Column(name = "comment_create_time")
+    private String commentCreateTime  ;
+    @Column(name = "comment_update_time")
+    private String commentUpdateTime  ;
+    @Column(name = "comment_contents")
+    private String commentContents  ;
+
+    @JoinColumn(name = "user")
+    @ManyToOne
+    private User user ;
+
+    @JoinColumn(name = "recipe")
+    @ManyToOne
+    private Recipe recipe ;
+}

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

@@ -0,0 +1,66 @@
+package moja.refrigerator.aggregate.recipe;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.annotation.Nullable;
+import jakarta.persistence.*;
+import lombok.Data;
+import moja.refrigerator.aggregate.user.User;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Entity
+@Table(name = "tbl_recipe")
+public class Recipe {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "recipe_pk")
+    private long recipePk;
+
+    @Column(name = "recipe_name")
+    private String recipeName;
+
+    @Column(name = "recipe_cooking_time")
+    private int recipeCookingTime;
+
+    @Column(name = "recipe_content",columnDefinition = "TEXT") // 길이 제한을 해제하기 위해 text로 설정
+    private String recipeContent;
+
+    @CreationTimestamp
+    @Column(name = "recipe_create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
+    private LocalDateTime  recipeCreateTime;
+
+    @UpdateTimestamp
+    @Column(name = "recipe_update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
+    private LocalDateTime  recipeUpdateTime;
+
+    @Column(name = "recipe_difficulty")
+    private int recipeDifficulty;
+
+    @Column(name = "recipe_views")
+    private long recipeViews = 0;
+
+    @JoinColumn(name = "user")
+    @ManyToOne
+    private User user;
+
+    @OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.LAZY) // 1개의 레시피에 여러 이미지가 들어갈 수 있으니까 수정
+    @JsonManagedReference
+    private List<RecipeSource> recipeSource = new ArrayList<>() ; // 여러 Source가 들어갈 수 있으니까 list로 수정
+
+
+    @JoinColumn(name = "recipe_category")
+    @ManyToOne
+    private RecipeCategory recipeCategory;
+
+    @OneToMany(mappedBy = "recipe")
+    private List<RecipeIngredient> recipeIngredients;
+}

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

@@ -0,0 +1,17 @@
+package moja.refrigerator.aggregate.recipe;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name="tbl_recipe_category")
+public class RecipeCategory {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "recipe_category_pk")
+    private int recipeCategoryPK;
+
+    @Column(name = "recipe_category")
+    private String recipeCategory;
+}

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

@@ -0,0 +1,28 @@
+package moja.refrigerator.aggregate.recipe;
+
+import jakarta.persistence.*;
+import lombok.Data;
+import moja.refrigerator.aggregate.ingredient.IngredientManagement;
+import moja.refrigerator.aggregate.ingredient.IngredientMyRefrigerator;
+
+@Data
+@Entity
+@Table(name = "tbl_recipe_ingredient")
+public class RecipeIngredient {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "recipe_ingredient_pk")
+    private long recipeIngredientPk ;
+
+    @Column(name = "ingredient_is_necessary")
+    private boolean ingredientIsNecessary ;
+
+    @JoinColumn(name = "ingredient_management")
+    @ManyToOne
+    private IngredientManagement ingredientManagement;
+//    private IngredientMyRefrigerator ingredientMyRefrigerator ;
+
+    @JoinColumn(name = "recipe")
+    @ManyToOne
+    private Recipe recipe;
+}