Skip to content

#28 내 냉장고 조회 수정 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LeeGukgeon merged 1 commit into from
Dec 21, 2024
+14 −0
Merged

#28 내 냉장고 조회 수정 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions refrigerator/src/main/java/moja/refrigerator/dto/ingredient/response/IngredientResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand Down
11 changes: 11 additions & 0 deletions refrigerator/src/main/java/moja/refrigerator/service/ingredient/IngredientServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public void createIngredient(IngredientCreateRequest request, Long userPk, Long
@Transactional(readOnly = true)
public List<IngredientResponse> getIngredient(Long userPk) {
List<IngredientMyRefrigerator> ingredients = ingredientMyRefrigeratorRepository.findByUserUserPk(userPk);
List<IngredientBookmark> ingredientBookmarks = ingredientBookmarkRepository.findAllByUser_UserPk(userPk);

LocalDate currentDate = LocalDate.now();
AtomicInteger counter = new AtomicInteger(1);
Expand All @@ -76,6 +77,16 @@ public List<IngredientResponse> 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());
Expand Down