diff --git a/hackathon/src/main/java/nerdinary/hackathon/domain/food/dto/AllFoodListResponse.java b/hackathon/src/main/java/nerdinary/hackathon/domain/food/dto/AllFoodListResponse.java index 510d81b..9fbbd6f 100644 --- a/hackathon/src/main/java/nerdinary/hackathon/domain/food/dto/AllFoodListResponse.java +++ b/hackathon/src/main/java/nerdinary/hackathon/domain/food/dto/AllFoodListResponse.java @@ -13,4 +13,5 @@ public class AllFoodListResponse { private String foodCategory; private LocalDate expirationDate; private long daysLeft; + private String storageMethod; } diff --git a/hackathon/src/main/java/nerdinary/hackathon/domain/food/service/FoodServiceImpl.java b/hackathon/src/main/java/nerdinary/hackathon/domain/food/service/FoodServiceImpl.java index de4f60d..6ea553c 100644 --- a/hackathon/src/main/java/nerdinary/hackathon/domain/food/service/FoodServiceImpl.java +++ b/hackathon/src/main/java/nerdinary/hackathon/domain/food/service/FoodServiceImpl.java @@ -130,7 +130,8 @@ public List getAllFoodsWithDday(Long userId) { long daysLeft = expiration != null ? ChronoUnit.DAYS.between(LocalDate.now(), expiration) : -1; - return new AllFoodListResponse(id, name, category, expiration, daysLeft); + String storageMethod = foodRegister.getStorageMethod(); + return new AllFoodListResponse(id, name, category, expiration, daysLeft, storageMethod); }) .toList(); } @@ -164,7 +165,8 @@ public List getFilteredFoods(Long userId, String storageMet long daysLeft = expiration != null ? ChronoUnit.DAYS.between(LocalDate.now(), expiration) : -1; - return new AllFoodListResponse(id, name, category, expiration, daysLeft); + String method = fr.getStorageMethod(); + return new AllFoodListResponse(id, name, category, expiration, daysLeft,method); }) .toList(); }