From 335df918fcc45242140166e6763950cd7054b3e7 Mon Sep 17 00:00:00 2001 From: LeeGukgeon Date: Mon, 9 Dec 2024 18:04:44 +0900 Subject: [PATCH 1/2] recipe aggregate, controller, repository, service basic --- .../aggregate/recipe/Comment.java | 30 ++++++++++++ .../refrigerator/aggregate/recipe/Recipe.java | 46 +++++++++++++++++++ .../aggregate/recipe/RecipeCategory.java | 17 +++++++ .../aggregate/recipe/RecipeIngredient.java | 26 +++++++++++ .../aggregate/recipe/RecipeLike.java | 24 ++++++++++ .../aggregate/recipe/RecipeSource.java | 30 ++++++++++++ .../aggregate/recipe/RecipeSourceType.java | 18 ++++++++ .../recipe/ReplacableIngredient.java | 23 ++++++++++ .../controller/recipe/RecipeController.java | 17 +++++++ .../repository/recipe/RecipeRepository.java | 8 ++++ .../service/recipe/RecipeService.java | 4 ++ .../service/recipe/RecipeServiceImpl.java | 20 ++++++++ 12 files changed, 263 insertions(+) create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Comment.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Recipe.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeCategory.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeIngredient.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeLike.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSourceType.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/controller/recipe/RecipeController.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/repository/recipe/RecipeRepository.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeService.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeServiceImpl.java diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Comment.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Comment.java new file mode 100644 index 0000000..21d300a --- /dev/null +++ b/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 ; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Recipe.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Recipe.java new file mode 100644 index 0000000..aa32223 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Recipe.java @@ -0,0 +1,46 @@ +package moja.refrigerator.aggregate.recipe; + +import jakarta.persistence.*; +import lombok.Data; +import moja.refrigerator.aggregate.user.User; + +@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_create_time") + private String recipeCreateTime; + + @Column(name = "recipe_update_time") + private String recipeUpdateTime; + + @Column(name = "recipe_difficulty") + private int recipeDifficulty; + + @Column(name = "recipe_views") + private long recipeViews; + + @JoinColumn(name = "user") + @ManyToOne + private User user; + + @JoinColumn(name = "cooking_source") + @ManyToOne + private RecipeSource recipeSource; + + @JoinColumn(name = "recipe_category") + @ManyToOne + private RecipeCategory recipeCategory; +} \ No newline at end of file diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeCategory.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeCategory.java new file mode 100644 index 0000000..8fb98cd --- /dev/null +++ b/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; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeIngredient.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeIngredient.java new file mode 100644 index 0000000..e530f63 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeIngredient.java @@ -0,0 +1,26 @@ +package moja.refrigerator.aggregate.recipe; + +import jakarta.persistence.*; +import lombok.Data; +import moja.refrigerator.aggregate.ingredient.IngredientManagement; + +@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; + + @JoinColumn(name = "recipe") + @ManyToOne + private Recipe recipe; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeLike.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeLike.java new file mode 100644 index 0000000..402462a --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeLike.java @@ -0,0 +1,24 @@ +package moja.refrigerator.aggregate.recipe; + + +import jakarta.persistence.*; +import lombok.Data; +import moja.refrigerator.aggregate.user.User; + +@Data +@Entity +@Table(name="tbl_recipe_like") +public class RecipeLike { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "like_pk") + private long likePk; + + @JoinColumn(name = "user") + @ManyToOne + private User user; + + @JoinColumn(name = "recipe") + @ManyToOne + private Recipe recipe; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java new file mode 100644 index 0000000..85c63ef --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java @@ -0,0 +1,30 @@ +package moja.refrigerator.aggregate.recipe; + + +import jakarta.persistence.*; +import lombok.Data; + +@Data +@Entity +@Table(name="tbl_recipe_source") +public class RecipeSource { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "cooking_source_pk") + private long cookingSourcePk; + + @Column(name = "cooking_source_save") + private String cookingSourceSave; + + @Column(name = "cooking_source_create_time") + private String CookingSourceCreateTime; + + @Column(name = "cooking_source_file_name") + private String CookingSourceFileName; + + @JoinColumn(name = "cooking_source_type") + @OneToOne + private RecipeSourceType cookingSourceType; + +} + diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSourceType.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSourceType.java new file mode 100644 index 0000000..e785111 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSourceType.java @@ -0,0 +1,18 @@ +package moja.refrigerator.aggregate.recipe; + + +import jakarta.persistence.*; +import lombok.Data; + +@Table(name = "tbl_recipe_source_type") +@Entity +@Data +public class RecipeSourceType { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "cooking_source_type_pk") + private int cookingSourceTypePk; + + @Column(name = "cooking_source_type",length = 50) + private String cookingSourceType; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java new file mode 100644 index 0000000..262bd10 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java @@ -0,0 +1,23 @@ +package moja.refrigerator.aggregate.recipe; + +import jakarta.persistence.*; +import lombok.Data; +import moja.refrigerator.aggregate.ingredient.IngredientManagement; + +@Data +@Entity +@Table(name = "tbl_replacable_ingredient") +public class ReplacableIngredient { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "replaceable_ingredient_pk") + private long ReplaceableIngredientPk ; + + @JoinColumn(name = "ingredient_management") + @ManyToOne + private IngredientManagement ingredientManagement; + + @JoinColumn(name = "recipe_ingredient") + @ManyToOne + private RecipeIngredient RecipeIngredient ; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/controller/recipe/RecipeController.java b/refrigerator/src/main/java/moja/refrigerator/controller/recipe/RecipeController.java new file mode 100644 index 0000000..ce53d0b --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/controller/recipe/RecipeController.java @@ -0,0 +1,17 @@ +package moja.refrigerator.controller.recipe; + +import moja.refrigerator.service.recipe.RecipeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/recipe") +public class RecipeController { + private RecipeService recipeService; + + @Autowired + public RecipeController(RecipeService recipeService) { + this.recipeService = recipeService; + } +} diff --git a/refrigerator/src/main/java/moja/refrigerator/repository/recipe/RecipeRepository.java b/refrigerator/src/main/java/moja/refrigerator/repository/recipe/RecipeRepository.java new file mode 100644 index 0000000..28dc01e --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/repository/recipe/RecipeRepository.java @@ -0,0 +1,8 @@ +package moja.refrigerator.repository.recipe; + +import moja.refrigerator.aggregate.recipe.Recipe; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface RecipeRepository extends JpaRepository { +} + diff --git a/refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeService.java b/refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeService.java new file mode 100644 index 0000000..ca44892 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeService.java @@ -0,0 +1,4 @@ +package moja.refrigerator.service.recipe; + +public interface RecipeService { +} diff --git a/refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeServiceImpl.java b/refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeServiceImpl.java new file mode 100644 index 0000000..63d5c90 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/service/recipe/RecipeServiceImpl.java @@ -0,0 +1,20 @@ +package moja.refrigerator.service.recipe; + + +import moja.refrigerator.repository.recipe.RecipeRepository; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class RecipeServiceImpl implements RecipeService { + + private RecipeRepository recipeRepository; + private ModelMapper mapper; + + @Autowired + public RecipeServiceImpl(RecipeRepository recipeRepository, ModelMapper mapper) { + this.recipeRepository = recipeRepository; + this.mapper = mapper; + } +} \ No newline at end of file From e842e7c963aa92746271e525cc25603281a86458 Mon Sep 17 00:00:00 2001 From: mincheol Date: Tue, 10 Dec 2024 15:08:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[=EA=B9=80=EB=AF=BC=EC=B2=A0]=20column=20?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95..=20(=EB=8C=80=EC=86=8C=EB=AC=B8?= =?UTF-8?q?=EC=9E=90)=201210?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregate/ingredient/IngredientCategory.java | 4 ++-- .../aggregate/ingredient/IngredientStorage.java | 4 ++-- .../java/moja/refrigerator/aggregate/recipe/Comment.java | 8 ++++---- .../refrigerator/aggregate/recipe/RecipeCategory.java | 2 +- .../moja/refrigerator/aggregate/recipe/RecipeSource.java | 4 ++-- .../aggregate/recipe/ReplacableIngredient.java | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientCategory.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientCategory.java index 94f0113..56de8ce 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientCategory.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientCategory.java @@ -11,8 +11,8 @@ public class IngredientCategory { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ingredient_category_pk") - private int IngredientCategoryPk; + private int ingredientCategoryPk; @Column(name = "ingredient_category") - private String IngredientCategory; + private String ingredientCategory; } diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java index 0413b68..2dc7828 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java @@ -10,8 +10,8 @@ public class IngredientStorage { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ingredient_storage_pk") - private int IngredientStoragePk; + private int ingredientStoragePk; @Column(name = "ingredient_storage") - private String IngredientStorage; + private String ingredientStorage; } diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Comment.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Comment.java index 21d300a..694fc8a 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Comment.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/Comment.java @@ -11,14 +11,14 @@ public class Comment { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "comment_pk") - private long CommentPk ; + private long commentPk ; @Column(name = "comment_create_time") - private String CommentCreateTime ; + private String commentCreateTime ; @Column(name = "comment_update_time") - private String CommentUpdateTime ; + private String commentUpdateTime ; @Column(name = "comment_contents") - private String CommentContents ; + private String commentContents ; @JoinColumn(name = "user") @ManyToOne diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeCategory.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeCategory.java index 8fb98cd..c5561ea 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeCategory.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeCategory.java @@ -10,7 +10,7 @@ public class RecipeCategory { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "recipe_category_pk") - private int RecipeCategoryPK; + private int recipeCategoryPK; @Column(name = "recipe_category") private String recipeCategory; diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java index 85c63ef..6f16f80 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/RecipeSource.java @@ -17,10 +17,10 @@ public class RecipeSource { private String cookingSourceSave; @Column(name = "cooking_source_create_time") - private String CookingSourceCreateTime; + private String cookingSourceCreateTime; @Column(name = "cooking_source_file_name") - private String CookingSourceFileName; + private String cookingSourceFileName; @JoinColumn(name = "cooking_source_type") @OneToOne diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java index 262bd10..260fc7b 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/recipe/ReplacableIngredient.java @@ -11,7 +11,7 @@ public class ReplacableIngredient { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "replaceable_ingredient_pk") - private long ReplaceableIngredientPk ; + private long replaceableIngredientPk ; @JoinColumn(name = "ingredient_management") @ManyToOne @@ -19,5 +19,5 @@ public class ReplacableIngredient { @JoinColumn(name = "recipe_ingredient") @ManyToOne - private RecipeIngredient RecipeIngredient ; + private RecipeIngredient recipeIngredient ; }