From a611a744fd064bd011b1d921d1690d7fe61f3b82 Mon Sep 17 00:00:00 2001 From: yunjaeeun Date: Sat, 21 Dec 2024 21:51:05 +0900 Subject: [PATCH] =?UTF-8?q?Feat:=20=EB=82=B4=20=EB=83=89=EC=9E=A5=EA=B3=A0?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 즐겨찾기 여부, 재료 카테고리 데이터 추가 Resolves: #28 --- .../dto/ingredient/response/IngredientResponse.java | 3 +++ .../service/ingredient/IngredientServiceImpl.java | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/IngredientResponse.java b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/IngredientResponse.java index bda5d0b..0d4497c 100644 --- a/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/IngredientResponse.java +++ b/refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/IngredientResponse.java @@ -13,6 +13,9 @@ public class IngredientResponse { private long remainExpirationDate; private int seasonDate; private String ingredientStorage; + private long ingredientManagementPk; + private boolean isBookmarked; + private String ingredientCategory; // ModelMapper 를 위한 기본 생성자 생성 public IngredientResponse() {} 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 9842b63..e64dd58 100644 --- a/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java +++ b/refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java @@ -65,6 +65,7 @@ public void createIngredient(IngredientCreateRequest request, Long userPk, Long @Transactional(readOnly = true) public List getIngredient(Long userPk) { List ingredients = ingredientMyRefrigeratorRepository.findByUserUserPk(userPk); + List ingredientBookmarks = ingredientBookmarkRepository.findAllByUser_UserPk(userPk); LocalDate currentDate = LocalDate.now(); AtomicInteger counter = new AtomicInteger(1); @@ -76,6 +77,16 @@ public List getIngredient(Long userPk) { response.setIngredientName(ingredient.getIngredientManagement().getIngredientName()); response.setSeasonDate(ingredient.getIngredientManagement().getSeasonDate()); response.setIngredientStorage(ingredient.getIngredientManagement().getIngredientStorage().getIngredientStorage()); + response.setIngredientCategory(ingredient.getIngredientManagement().getIngredientCategory().getIngredientCategory()); + boolean isBookmark = false; + for (IngredientBookmark ingredientBookmark : ingredientBookmarks) { + if (ingredientBookmark.getIngredientMyRefrigerator().getIngredientMyRefrigeratorPk() + == ingredient.getIngredientMyRefrigeratorPk()) { + isBookmark = true; + break; + } + } + response.setBookmarked(isBookmark); // 현재 날짜 기준, 유통기한 남은 일수 계산 LocalDate expirationDate = LocalDate.parse(ingredient.getExpirationDate());