운영 환경 반영

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/in/food/response/GetFoodResponse.java

@@ -1,6 +1,6 @@
 package com.gaebaljip.exceed.adapter.in.food.response;
 
-import com.gaebaljip.exceed.adapter.out.jpa.food.FoodEntity;
+import com.gaebaljip.exceed.application.domain.food.FoodEntity;
 
 public record GetFoodResponse(
         Long foodId,

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/food/FoodRepository.java

@@ -7,6 +7,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.gaebaljip.exceed.application.domain.food.FoodEntity;
 import com.gaebaljip.exceed.application.domain.member.MemberEntity;
 
 public interface FoodRepository extends JpaRepository<FoodEntity, Long> {

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/food/FoodsPersistenceAdapter.java

@@ -4,6 +4,7 @@
 
 import org.springframework.stereotype.Component;
 
+import com.gaebaljip.exceed.application.domain.food.FoodEntity;
 import com.gaebaljip.exceed.application.domain.member.MemberEntity;
 import com.gaebaljip.exceed.application.port.out.food.FoodPort;
 import com.gaebaljip.exceed.common.exception.food.FoodNotFoundException;

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/food/QueryDslFoodRepository.java

@@ -4,6 +4,8 @@
 
 import org.springframework.stereotype.Repository;
 
+import com.gaebaljip.exceed.application.domain.food.FoodEntity;
+import com.gaebaljip.exceed.application.domain.food.QFoodEntity;
 import com.gaebaljip.exceed.common.dto.PageableFoodDTO;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/meal/MealPersistenceAdapter.java

@@ -11,8 +11,7 @@
 import org.springframework.stereotype.Component;
 
 import com.gaebaljip.exceed.adapter.out.jpa.nutritionist.MonthlyMealPort;
-import com.gaebaljip.exceed.application.domain.meal.DailyMeal;
-import com.gaebaljip.exceed.application.domain.meal.Meal;
+import com.gaebaljip.exceed.application.domain.meal.DailyMealFoods;
 import com.gaebaljip.exceed.application.domain.meal.MealEntity;
 import com.gaebaljip.exceed.application.domain.meal.MealFoodEntity;
 import com.gaebaljip.exceed.application.domain.member.MemberEntity;
@@ -30,7 +29,6 @@
 public class MealPersistenceAdapter implements MealPort, DailyMealPort, MonthlyMealPort {
 
     private final MealRepository mealRepository;
-    private final MealFoodConverter mealFoodConverter;
     private final MealFoodRepository mealFoodRepository;
 
     @Override
@@ -40,14 +38,29 @@ public MealEntity command(MealEntity mealEntity) {
 
     @Override
     @Timer
-    public List<Meal> query(DailyMealDTO dailyMealDTO) {
+    public DailyMealFoods queryDailyMealFoods(DailyMealDTO dailyMealDTO) {
         LocalDateTime today = dailyMealDTO.date().toLocalDate().atStartOfDay();
         LocalDateTime tomorrow = today.plusDays(1);
         List<Long> mealIds =
                 mealRepository.findMealIdsByMemberAndDaily(
                         today, tomorrow, dailyMealDTO.memberId());
         List<MealFoodEntity> mealFoodEntities = mealFoodRepository.findMFTByIdInQuery(mealIds);
-        return mealFoodConverter.toMeals(mealFoodEntities);
+        return new DailyMealFoods(mealFoodEntities);
+    }
+
+    @Override
+    public List<MealEntity> queryMeals(DailyMealDTO dailyMealDTO) {
+        LocalDateTime today = dailyMealDTO.date().toLocalDate().atStartOfDay();
+        LocalDateTime tomorrow = today.plusDays(1);
+        List<MealEntity> mealEntities =
+                mealRepository.findMealsByMemberAndDaily(today, tomorrow, dailyMealDTO.memberId());
+        return mealEntities;
+    }
+
+    @Override
+    public DailyMealFoods queryMealFoods(List<Long> mealIds) {
+        List<MealFoodEntity> mealFoodEntities = mealFoodRepository.findMFTByIdInQuery(mealIds);
+        return new DailyMealFoods(mealFoodEntities);
     }
 
     @Override
@@ -61,20 +74,18 @@ public MonthlyMeal query(MonthlyMealDTO monthlyMealDTO) {
                 mealRepository.findMealIdsByMemberAndMonth(
                         startOfMonth, endOfMonth, monthlyMealDTO.memberId());
         List<MealFoodEntity> mealFoodEntities = mealFoodRepository.findMFTByIdInQuery(mealIds);
-
-        List<Meal> meals = mealFoodConverter.toMeals(mealFoodEntities);
-        Map<LocalDate, DailyMeal> monthlyMeal =
-                meals.stream()
+        Map<LocalDate, DailyMealFoods> monthlyMeal =
+                mealFoodEntities.stream()
                         .collect(
                                 Collectors.groupingBy(
-                                        meal -> meal.getMealDateTime().toLocalDate(),
+                                        mealFood -> mealFood.getCreatedDate().toLocalDate(),
                                         Collectors.collectingAndThen(
-                                                Collectors.toList(), DailyMeal::new)));
-        List<Meal> emptyMeal = new ArrayList<>();
+                                                Collectors.toList(), DailyMealFoods::new)));
+        List<MealFoodEntity> emptyMealFood = new ArrayList<>();
         startOfMonth
                 .toLocalDate()
                 .datesUntil(endOfMonth.toLocalDate())
-                .forEach(day -> monthlyMeal.putIfAbsent(day, new DailyMeal(emptyMeal)));
+                .forEach(day -> monthlyMeal.putIfAbsent(day, new DailyMealFoods(emptyMealFood)));
         return new MonthlyMeal(monthlyMeal);
     }
 

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/meal/MealRepository.java

@@ -19,6 +19,11 @@ public interface MealRepository extends JpaRepository<MealEntity, Long> {
     List<Long> findMealIdsByMemberAndDaily(
             LocalDateTime today, LocalDateTime tomorrow, Long memberId);
 
+    @Query(
+            "select m from MealEntity m where m.memberEntity.id = :memberId and m.createdDate >= :today and m.createdDate < :tomorrow")
+    List<MealEntity> findMealsByMemberAndDaily(
+            LocalDateTime today, LocalDateTime tomorrow, Long memberId);
+
     @Timer
     @Query(
             "select m.id from MealEntity m where m.memberEntity.id = :memberId and m.createdDate >= :startOfMonth and m.createdDate < :endOfMonth")

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/food/FoodEntity.java → BE/exceed/src/main/java/com/gaebaljip/exceed/application/domain/food/FoodEntity.java

@@ -1,4 +1,4 @@
-package com.gaebaljip.exceed.adapter.out.jpa.food;
+package com.gaebaljip.exceed.application.domain.food;
 
 import javax.persistence.*;