From 25ee5a46ea46fbe775cd62927b2f5fdb60880495 Mon Sep 17 00:00:00 2001 From: yunjaeeun Date: Sat, 14 Dec 2024 23:27:32 +0900 Subject: [PATCH] =?UTF-8?q?Feat:=20=EC=9E=AC=EB=A3=8C=20=EC=A6=90=EA=B2=A8?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 사용자 냉장고 생성에 따른 로직 수정 Resolves: #14 --- .../aggregate/ingredient/IngredientBookmark.java | 4 ++-- .../request/RequestRegistIngredientBookmark.java | 2 +- .../response/ResponseRegistIngredientBookmark.java | 3 ++- .../ResponseUsersIngredientBookmarkLists.java | 3 ++- .../service/ingredient/IngredientServiceImpl.java | 14 +++++++------- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java index 5140c88..b609706 100644 --- a/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java +++ b/refrigerator/src/main/java/moja/refrigerator/aggregate/ingredient/IngredientBookmark.java @@ -19,6 +19,6 @@ public class IngredientBookmark { private User user; @ManyToOne - @JoinColumn(name = "ingredient_management_pk") - private IngredientManagement ingredientManagement; + @JoinColumn(name = "ingredient_my_refrigerator_pk") + private IngredientMyRefrigerator ingredientMyRefrigerator; } diff --git a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/request/RequestRegistIngredientBookmark.java b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/request/RequestRegistIngredientBookmark.java index 33c0ccf..61cb5ac 100644 --- a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/request/RequestRegistIngredientBookmark.java +++ b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/request/RequestRegistIngredientBookmark.java @@ -5,5 +5,5 @@ @Data public class RequestRegistIngredientBookmark { private long userPk; - private long ingredientPk; + private long ingredientMyRefrigeratorPk; } diff --git a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseRegistIngredientBookmark.java b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseRegistIngredientBookmark.java index 41c5dab..439616d 100644 --- a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseRegistIngredientBookmark.java +++ b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseRegistIngredientBookmark.java @@ -3,11 +3,12 @@ import lombok.Data; import moja.refrigerator.aggregate.ingredient.IngredientBookmark; import moja.refrigerator.aggregate.ingredient.IngredientManagement; +import moja.refrigerator.aggregate.ingredient.IngredientMyRefrigerator; import moja.refrigerator.aggregate.user.User; @Data public class ResponseRegistIngredientBookmark { private long ingredientBookmarkPk; private User user; - private IngredientManagement ingredientManagement; + private IngredientMyRefrigerator ingredientMyRefrigerator; } diff --git a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseUsersIngredientBookmarkLists.java b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseUsersIngredientBookmarkLists.java index 868338c..c279d91 100644 --- a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseUsersIngredientBookmarkLists.java +++ b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/ResponseUsersIngredientBookmarkLists.java @@ -2,8 +2,9 @@ import lombok.Data; import moja.refrigerator.aggregate.ingredient.IngredientManagement; +import moja.refrigerator.aggregate.ingredient.IngredientMyRefrigerator; @Data public class ResponseUsersIngredientBookmarkLists { - private IngredientManagement ingredientManagement; + private IngredientMyRefrigerator ingredientMyRefrigerator; } diff --git a/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java b/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java index 13cf998..3b4c2aa 100644 --- a/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java +++ b/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java @@ -102,14 +102,14 @@ public ResponseRegistIngredientBookmark createIngredientBookmark(RequestRegistIn User user = userRepository.findById(requestBookmark.getUserPk()) .orElseThrow(() -> new EntityNotFoundException("회원을 찾을 수 없습니다.")); - IngredientManagement ingredientManagement = ingredientManagementRepository - .findById(requestBookmark.getIngredientPk()) + IngredientMyRefrigerator ingredientManagement = ingredientMyRefrigeratorRepository + .findById(requestBookmark.getIngredientMyRefrigeratorPk()) .orElseThrow(() -> new EntityNotFoundException("재료를 찾을 수 없습니다.")); IngredientBookmark ingredientBookmark = new IngredientBookmark(); ingredientBookmark.setUser(user); - ingredientBookmark.setIngredientManagement(ingredientManagement); + ingredientBookmark.setIngredientMyRefrigerator(ingredientManagement); ingredientBookmarkRepository.save(ingredientBookmark); @@ -142,14 +142,14 @@ public ResponseDeleteIngredientBookmark deleteIngredientBookmark( try { ingredientBookmarkRepository.deleteById(requestDeleteBookmark.getIngredientBookmarkPk()); - String message = ingredientBookmark.getIngredientManagement() - .getIngredientName() + " 재료의 즐겨찾기를 삭제했습니다"; + String message = ingredientBookmark.getIngredientMyRefrigerator() + .getIngredientManagement().getIngredientName() + " 재료의 즐겨찾기를 삭제했습니다"; response.setMessage(message); return response; } catch (Exception e) { String message = - ingredientBookmark.getIngredientManagement() - .getIngredientName() + " 재료의 즐겨찾기를 삭제 실패했습니다"; + ingredientBookmark.getIngredientMyRefrigerator() + .getIngredientManagement().getIngredientName() + " 재료의 즐겨찾기를 삭제 실패했습니다"; response.setMessage(message); return response; }