From 2d8262dd6f8f2de5cf30f7c7a07db73d88fd36ef Mon Sep 17 00:00:00 2001 From: yunjaeeun Date: Mon, 9 Dec 2024 14:40:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20=EC=9E=AC=EB=A3=8C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 재료관리 entity 추가 2. 재료관리 service, controller, repository 추가 3. user dummy entity 추가 Resolves: #1 --- .../ingredient/IngredientBookmark.java | 24 +++++++++++++ .../ingredient/IngredientCategory.java | 14 ++++++++ .../ingredient/IngredientManagement.java | 35 +++++++++++++++++++ .../ingredient/IngredientStorage.java | 17 +++++++++ .../refrigerator/aggregate/user/User.java | 14 ++++++++ .../ingredient/IngredientController.java | 17 +++++++++ .../IngredientManagementRepository.java | 7 ++++ .../service/ingredient/IngredientService.java | 4 +++ .../ingredient/IngredientServiceImpl.java | 20 +++++++++++ 9 files changed, 152 insertions(+) create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientManagement.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/aggregate/user/User.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/controller/ingredient/IngredientController.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientService.java create mode 100644 refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java new file mode 100644 index 0000000..5f7a32b --- /dev/null +++ b/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") + private User user; + + @ManyToOne + @JoinColumn(name = "ingredient_management") + private IngredientManagement ingredientManagement; +} 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 7ab620e..94f0113 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientCategory.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientCategory.java @@ -1,4 +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; } diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientManagement.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientManagement.java new file mode 100644 index 0000000..5a9e5bb --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientManagement.java @@ -0,0 +1,35 @@ +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 = "expiration_date") + private String expirationDate; + + @Column(name = "registration_date") + private String registrationDate; + + @Column(name = "season_date") + private int seasonDate; + + @JoinColumn(name = "ingredient_category") + @ManyToOne + private IngredientCategory ingredientCategory; + + @JoinColumn(name = "ingredient_storage") + @ManyToOne + private IngredientStorage ingredientStorage; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientStorage.java new file mode 100644 index 0000000..0413b68 --- /dev/null +++ b/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; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/user/User.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/user/User.java new file mode 100644 index 0000000..a352fc0 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/user/User.java @@ -0,0 +1,14 @@ +package moja.refrigerator.aggregate.user; + +import jakarta.persistence.*; +import lombok.Data; + +@Entity +@Table(name = "tbl_user") +@Data +public class User { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "user_pk") + private long userPk; +} diff --git a/refrigerator/src/main/java/moja/refrigerator/controller/ingredient/IngredientController.java b/refrigerator/src/main/java/moja/refrigerator/controller/ingredient/IngredientController.java new file mode 100644 index 0000000..94315c0 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/controller/ingredient/IngredientController.java @@ -0,0 +1,17 @@ +package moja.refrigerator.controller.ingredient; + +import moja.refrigerator.service.ingredient.IngredientService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/ingredient") +public class IngredientController { + private IngredientService ingredientService; + + @Autowired + public IngredientController(IngredientService ingredientService) { + this.ingredientService = ingredientService; + } +} diff --git a/refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java b/refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java new file mode 100644 index 0000000..e71665c --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java @@ -0,0 +1,7 @@ +package moja.refrigerator.repository.ingredient; + +import moja.refrigerator.aggregate.ingredient.IngredientManagement; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IngredientManagementRepository extends JpaRepository { +} diff --git a/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientService.java b/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientService.java new file mode 100644 index 0000000..92b1ac0 --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientService.java @@ -0,0 +1,4 @@ +package moja.refrigerator.service.ingredient; + +public interface IngredientService { +} diff --git a/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java b/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java new file mode 100644 index 0000000..8dd1aeb --- /dev/null +++ b/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java @@ -0,0 +1,20 @@ +package moja.refrigerator.service.ingredient; + +import moja.refrigerator.repository.ingredient.IngredientManagementRepository; +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class IngredientServiceImpl implements IngredientService{ + + private IngredientManagementRepository ingredientManagementRepository; + private ModelMapper mapper; + + @Autowired + public IngredientServiceImpl(IngredientManagementRepository ingredientManagementRepository, + ModelMapper mapper) { + this.ingredientManagementRepository = ingredientManagementRepository; + this.mapper = mapper; + } +} From 7ab95e999831764cdca12cdab7b0f2029a6025fb Mon Sep 17 00:00:00 2001 From: yunjaeeun Date: Mon, 9 Dec 2024 14:57:59 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Feat:=20=EC=9E=AC=EB=A3=8C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Repository 수정 Fixes: #1 --- .../repository/ingredient/IngredientManagementRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java b/refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java index e71665c..c9619a4 100644 --- a/refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java +++ b/refrigerator/src/main/java/moja/refrigerator/repository/ingredient/IngredientManagementRepository.java @@ -3,5 +3,5 @@ import moja.refrigerator.aggregate.ingredient.IngredientManagement; import org.springframework.data.jpa.repository.JpaRepository; -public interface IngredientManagementRepository extends JpaRepository { +public interface IngredientManagementRepository extends JpaRepository { }