BE 운영 서버 반영

BE/exceed/build.gradle

@@ -59,6 +59,7 @@ dependencies {
 	testImplementation "org.testcontainers:testcontainers:1.19.8"
 	testImplementation "org.testcontainers:junit-jupiter:1.19.8"
 	testImplementation "org.testcontainers:localstack:1.19.8"
+	testImplementation "org.jeasy:easy-random-core:5.0.0"
 
 
 
@@ -216,8 +217,6 @@ jacocoTestReport {
 					fileTree(dir: it, excludes: [
 					        "**/ExceedApplication",
 							"**/*Config*",
-							"**/*Request*",
-							"**/*Response*",
 							"**/*Exception*",
 							"**/*Filter*",
 							"**/*Docs*",

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/in/meal/GetMealController.java

@@ -15,6 +15,7 @@
 import com.gaebaljip.exceed.adapter.in.nutritionist.request.GetAllAnalysisRequest;
 import com.gaebaljip.exceed.application.port.in.meal.GetCurrentMealQuery;
 import com.gaebaljip.exceed.application.port.in.meal.GetSpecificMealQuery;
+import com.gaebaljip.exceed.application.port.in.meal.ValidateBeforeSignUpUsecase;
 import com.gaebaljip.exceed.application.port.in.member.GetMaintainMealUsecase;
 import com.gaebaljip.exceed.application.port.in.member.GetTargetMealUsecase;
 import com.gaebaljip.exceed.application.service.nutritionist.GetAllCalorieAnalysisService;
@@ -46,6 +47,7 @@ public class GetMealController {
     private final GetCurrentMealQuery getCurrentMealQuery;
     private final GetSpecificMealQuery getSpecificMealQuery;
     private final GetAllCalorieAnalysisService getAllCalorieAnalysisService;
+    private final ValidateBeforeSignUpUsecase validateDateBeforeSignUpUsecase;
 
     /** 오늘 먹은 식사 정보(단,탄,지 및 칼로리) 조회 */
     @Operation(summary = "오늘 먹은 식사 정보 조회", description = "오늘 먹은 식사 정보(단,탄,지 및 칼로리)를 조회한다.")
@@ -68,6 +70,7 @@ public ApiResponse<ApiResponse.CustomBody<GetMealFoodResponse>> getMealFood(
             @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate date,
             @Parameter(hidden = true) @AuthenticationMemberId Long memberId) {
         LocalDateTime localDateTime = date.atStartOfDay();
+        validateDateBeforeSignUpUsecase.execute(memberId, localDateTime);
         MaintainMealDTO maintainMealDTO = getMaintainMealUsecase.execute(memberId, localDateTime);
         TargetMealDTO targetMealDTO = getTargetMealUsecase.execute(memberId, localDateTime);
         SpecificMealDTO specificMealDTO = getSpecificMealQuery.execute(memberId, localDateTime);

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

@@ -6,7 +6,7 @@
 
 import com.gaebaljip.exceed.application.domain.member.MemberEntity;
 import com.gaebaljip.exceed.application.port.out.food.FoodPort;
-import com.gaebaljip.exceed.common.exception.member.MemberNotFoundException;
+import com.gaebaljip.exceed.common.exception.food.FoodNotFoundException;
 
 import lombok.RequiredArgsConstructor;
 
@@ -48,6 +48,6 @@ public List<FoodEntity> findByMemberEntity(MemberEntity memberEntity) {
 
     @Override
     public FoodEntity query(Long foodId) {
-        return foodRepository.findById(foodId).orElseThrow(() -> MemberNotFoundException.EXECPTION);
+        return foodRepository.findById(foodId).orElseThrow(() -> FoodNotFoundException.Exception);
     }
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/application/port/out/meal/MealConverter.java → BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/meal/MealConverter.java

@@ -1,10 +1,9 @@
-package com.gaebaljip.exceed.application.port.out.meal;
+package com.gaebaljip.exceed.adapter.out.jpa.meal;
 
 import java.util.List;
 
 import org.springframework.stereotype.Component;
 
-import com.gaebaljip.exceed.adapter.out.jpa.meal.ConsumedFoodConverter;
 import com.gaebaljip.exceed.application.domain.meal.Meal;
 import com.gaebaljip.exceed.application.domain.meal.MealEntity;
 import com.gaebaljip.exceed.common.annotation.Timer;

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

@@ -11,11 +11,10 @@
 import com.gaebaljip.exceed.application.domain.meal.MealEntity;
 import com.gaebaljip.exceed.application.domain.member.MemberEntity;
 import com.gaebaljip.exceed.application.port.out.meal.DailyMealPort;
-import com.gaebaljip.exceed.application.port.out.meal.MealConverter;
 import com.gaebaljip.exceed.application.port.out.meal.MealPort;
 import com.gaebaljip.exceed.common.annotation.Timer;
+import com.gaebaljip.exceed.common.dto.DailyMealDTO;
 import com.gaebaljip.exceed.common.dto.MonthlyMealDTO;
-import com.gaebaljip.exceed.common.dto.TodayMealDTO;
 
 import lombok.RequiredArgsConstructor;
 
@@ -25,19 +24,18 @@ public class MealPersistenceAdapter implements MealPort, DailyMealPort, MonthlyM
 
     private final MealRepository mealRepository;
     private final MealConverter mealConverter;
-    private final int FIRST_DAY = 1;
 
     @Override
     public MealEntity command(MealEntity mealEntity) {
         return mealRepository.save(mealEntity);
     }
 
     @Override
-    public List<Meal> query(TodayMealDTO todayMealDTO) {
-        LocalDateTime today = todayMealDTO.date().toLocalDate().atStartOfDay();
+    public List<Meal> query(DailyMealDTO dailyMealDTO) {
+        LocalDateTime today = dailyMealDTO.date().toLocalDate().atStartOfDay();
         LocalDateTime tomorrow = today.plusDays(1);
         List<MealEntity> mealEntities =
-                mealRepository.findAllTodayMeal(today, tomorrow, todayMealDTO.memberId());
+                mealRepository.findAllTodayMeal(today, tomorrow, dailyMealDTO.memberId());
         return mealConverter.toMeals(mealEntities);
     }
 

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/member/HistoryPersistenceAdapter.java

@@ -21,8 +21,8 @@ public HistoryEntity command(HistoryEntity historyEntity) {
     }
 
     @Override
-    public HistoryEntity findByMemberIdAndDate(Long memberId, LocalDateTime date) {
-        return historyRepository.findByMemberIdAndDate(memberId, date);
+    public HistoryEntity findMostRecentFutureMember(Long memberId, LocalDateTime date) {
+        return historyRepository.findMostRecentFutureMember(memberId, date);
     }
 
     @Override

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/member/MemberPersistenceAdapter.java

@@ -72,8 +72,8 @@ public MemberEntity findCheckedMemberByEmail(String email) {
     }
 
     @Override
-    public Optional<MemberEntity> findByIdAndDate(Long memberId, LocalDateTime date) {
-        return memberRepository.findByIdAndDate(memberId, date);
+    public Optional<MemberEntity> findMemberBeforeDate(Long memberId, LocalDateTime date) {
+        return memberRepository.findMemberBeforeDate(memberId, date);
     }
 
     @Override

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/member/custom/CustomHistoryRepository.java

@@ -8,5 +8,5 @@
 
 @Repository
 public interface CustomHistoryRepository {
-    HistoryEntity findByMemberIdAndDate(Long memberId, LocalDateTime date);
+    HistoryEntity findMostRecentFutureMember(Long memberId, LocalDateTime date);
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/member/custom/CustomHistoryRepositoryImpl.java

@@ -22,15 +22,20 @@ public class CustomHistoryRepositoryImpl implements CustomHistoryRepository {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public HistoryEntity findByMemberIdAndDate(Long memberId, LocalDateTime date) {
+    public HistoryEntity findMostRecentFutureMember(Long memberId, LocalDateTime date) {
         return queryFactory
                 .selectFrom(historyEntity)
-                .where(historyEntity.id.eq(memberId).and(checkDate(historyEntity, date)))
-                .orderBy(historyEntity.id.desc())
+                .where(
+                        historyEntity
+                                .memberEntity
+                                .id
+                                .eq(memberId)
+                                .and(checkFutureDate(historyEntity, date)))
+                .orderBy(historyEntity.id.asc())
                 .fetchFirst();
     }
 
-    private BooleanExpression checkDate(QHistoryEntity historyEntity, LocalDateTime date) {
-        return historyEntity.createdDate.before(date);
+    private BooleanExpression checkFutureDate(QHistoryEntity historyEntity, LocalDateTime date) {
+        return historyEntity.createdDate.after(date);
     }
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/member/custom/CustomMemberRepository.java

@@ -9,5 +9,5 @@
 
 @Repository
 public interface CustomMemberRepository {
-    Optional<MemberEntity> findByIdAndDate(Long memberId, LocalDateTime date);
+    Optional<MemberEntity> findMemberBeforeDate(Long memberId, LocalDateTime date);
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/adapter/out/jpa/member/custom/CustomMemberRepositoryImpl.java

@@ -21,7 +21,7 @@ public class CustomMemberRepositoryImpl implements CustomMemberRepository {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public Optional<MemberEntity> findByIdAndDate(Long memberId, LocalDateTime date) {
+    public Optional<MemberEntity> findMemberBeforeDate(Long memberId, LocalDateTime date) {
         MemberEntity result =
                 queryFactory
                         .selectFrom(memberEntity)
@@ -31,6 +31,6 @@ public Optional<MemberEntity> findByIdAndDate(Long memberId, LocalDateTime date)
     }
 
     private BooleanExpression checkDate(QMemberEntity memberEntity, LocalDateTime date) {
-        return memberEntity.createdDate.eq(date);
+        return memberEntity.updatedDate.before(date);
     }
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/application/domain/meal/ConsumedFood.java

@@ -4,9 +4,11 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 
 @Getter
 @Builder
+@ToString
 public class ConsumedFood {
 
     private Food food;

BE/exceed/src/main/java/com/gaebaljip/exceed/application/domain/meal/DailyMeal.java

@@ -4,18 +4,16 @@
 
 import java.util.List;
 
-import com.gaebaljip.exceed.common.exception.meal.InsufficientMealsException;
 import com.gaebaljip.exceed.common.exception.meal.NotSameDateException;
 
 import lombok.*;
 
 /**
- * 같은 날짜 즉, 하루에 먹은 식사를 나타내는 클래스 오늘 먹은 식사들을 분석하여 칼로리,단,탄,지를 계산한다.
+ * 하루에 먹은 식사들을 분석하여 칼로리,단,탄,지를 계산
  *
  * @author hwangdaesun
  * @version 1.0
  * @throws NotSameDateException : 식사들의 날짜가 다를 경우
- * @throws InsufficientMealsException : 식사를 한 번도 하지 않았을 경우
  */
 @Getter
 @ToString
@@ -24,8 +22,7 @@ public class DailyMeal {
     private final List<Meal> meals;
 
     public DailyMeal(List<Meal> meals) {
-        validateSize(meals);
-        validateSameMealDate(meals);
+        validateSameDateIfNotEmpty(meals);
         this.meals = meals;
     }
 
@@ -45,20 +42,21 @@ public double calculateCurrentFat() {
         return meals.stream().mapToDouble(Meal::getCurrentFat).sum();
     }
 
-    private void validateSize(List<Meal> meals) {
-        if (meals.isEmpty()) {
-            throw InsufficientMealsException.EXECPTION;
+    private void validateSameDateIfNotEmpty(List<Meal> meals) {
+        if (!meals.isEmpty() && !isSameDate(meals)) {
+            throw NotSameDateException.EXECPTION;
         }
     }
 
-    private void validateSameMealDate(List<Meal> meals) {
-        if (getDistinctSize(meals) != 1) throw NotSameDateException.EXECPTION;
-    }
-
-    private int getDistinctSize(List<Meal> meals) {
-        return meals.stream()
-                .map(meal -> meal.getMealDateTime().toLocalDate())
-                .collect(toSet())
-                .size();
+    private boolean isSameDate(List<Meal> meals) {
+        int size =
+                meals.stream()
+                        .map(meal -> meal.getMealDateTime().toLocalDate())
+                        .collect(toSet())
+                        .size();
+        if (size != 1) {
+            return false;
+        }
+        return true;
     }
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/application/domain/meal/Unit.java

@@ -2,8 +2,10 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 
 @Getter
+@ToString
 @Builder
 public class Unit {
     private double servingSize;

BE/exceed/src/main/java/com/gaebaljip/exceed/application/domain/member/MemberEntity.java

@@ -1,5 +1,7 @@
 package com.gaebaljip.exceed.application.domain.member;
 
+import java.time.LocalDateTime;
+
 import javax.persistence.*;
 
 import org.hibernate.annotations.ColumnDefault;
@@ -98,4 +100,8 @@ public boolean checkOnBoarding() {
                 && this.getGender() != null
                 && this.getTargetWeight() != null;
     }
+
+    public boolean checkIfBeforeSignUp(LocalDateTime checkDateTime) {
+        return checkDateTime.isBefore(this.getCreatedDate());
+    }
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/application/port/in/meal/ValidateBeforeSignUpUsecase.java

@@ -0,0 +1,10 @@
+package com.gaebaljip.exceed.application.port.in.meal;
+
+import java.time.LocalDateTime;
+
+import com.gaebaljip.exceed.common.annotation.UseCase;
+
+@UseCase
+public interface ValidateBeforeSignUpUsecase {
+    void execute(Long memberId, LocalDateTime dateTime);
+}

BE/exceed/src/main/java/com/gaebaljip/exceed/application/port/out/meal/DailyMealPort.java

@@ -5,9 +5,9 @@
 import org.springframework.stereotype.Component;
 
 import com.gaebaljip.exceed.application.domain.meal.Meal;
-import com.gaebaljip.exceed.common.dto.TodayMealDTO;
+import com.gaebaljip.exceed.common.dto.DailyMealDTO;
 
 @Component
 public interface DailyMealPort {
-    List<Meal> query(TodayMealDTO todayMealDTO);
+    List<Meal> query(DailyMealDTO dailyMealDTO);
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/application/port/out/member/HistoryPort.java

@@ -11,7 +11,7 @@
 public interface HistoryPort {
     HistoryEntity command(HistoryEntity historyEntity);
 
-    HistoryEntity findByMemberIdAndDate(Long memberId, LocalDateTime date);
+    HistoryEntity findMostRecentFutureMember(Long memberId, LocalDateTime date);
 
     List<HistoryEntity> findByMemberEntity(MemberEntity memberEntity);
 

BE/exceed/src/main/java/com/gaebaljip/exceed/application/port/out/member/MemberPort.java

@@ -23,7 +23,7 @@ public interface MemberPort {
 
     MemberEntity findCheckedMemberByEmail(String email);
 
-    Optional<MemberEntity> findByIdAndDate(Long memberId, LocalDateTime date);
+    Optional<MemberEntity> findMemberBeforeDate(Long memberId, LocalDateTime date);
 
     Boolean existsByEmail(String email);
 

BE/exceed/src/main/java/com/gaebaljip/exceed/application/service/meal/GetCurrentMealService.java

@@ -11,8 +11,8 @@
 import com.gaebaljip.exceed.application.port.in.meal.GetCurrentMealQuery;
 import com.gaebaljip.exceed.application.port.out.meal.DailyMealPort;
 import com.gaebaljip.exceed.common.dto.CurrentMealDTO;
-import com.gaebaljip.exceed.common.dto.TodayMealDTO;
-import com.gaebaljip.exceed.common.exception.meal.InvalidMultipleException;
+import com.gaebaljip.exceed.common.dto.DailyMealDTO;
+import com.gaebaljip.exceed.common.exception.meal.NotSameDateException;
 
 import lombok.RequiredArgsConstructor;
 
@@ -26,36 +26,24 @@
 @RequiredArgsConstructor
 public class GetCurrentMealService implements GetCurrentMealQuery {
 
-    public static final double ZERO = 0.0;
     private final DailyMealPort dailyMealPort;
 
     /**
-     * DailyMeal 도메인이 오늘 먹은 식사들을 분석하여 칼로리,단,탄,지 정보를 반환한다. 만약 식사 정보가 존재하지 않을 경우는 칼로리,단,탄,지 모두 ZERO를
-     * 반환한다.
+     * DailyMeal 도메인이 오늘 먹은 식사들을 분석하여 칼로리,단,탄,지 정보를 반환
      *
-     * @param memberId : 누가 무엇을 언제 얼마나 먹었는 지에 대한 정보가 들어있다.
-     * @return mealId : 식사 엔티티의 PK
-     * @throws InvalidMultipleException : 0인분 이하거나 100인분 초과일 경우
+     * @param memberId : 누가 무엇을 언제 얼마나 먹었는 지에 대한 정보
+     * @return currentMealDTO : calorie, carbohydrate, protein, fat
+     * @throws NotSameDateException : 같은 날짜가 아닐 경우
      */
     @Override
     @Transactional(readOnly = true)
     public CurrentMealDTO execute(Long memberId) {
-        List<Meal> meals = dailyMealPort.query(new TodayMealDTO(memberId, LocalDateTime.now()));
-        if (meals.isEmpty()) {
-            return CurrentMealDTO.builder()
-                    .calorie(ZERO)
-                    .carbohydrate(ZERO)
-                    .fat(ZERO)
-                    .protein(ZERO)
-                    .build();
-        } else {
-            DailyMeal dailyMeal = new DailyMeal(meals);
-            return CurrentMealDTO.builder()
-                    .calorie(dailyMeal.calculateCurrentCalorie())
-                    .carbohydrate(dailyMeal.calculateCurrentCarbohydrate())
-                    .fat(dailyMeal.calculateCurrentFat())
-                    .protein(dailyMeal.calculateCurrentProtein())
-                    .build();
-        }
+        List<Meal> meals = dailyMealPort.query(new DailyMealDTO(memberId, LocalDateTime.now()));
+        DailyMeal dailyMeal = new DailyMeal(meals);
+        return CurrentMealDTO.of(
+                dailyMeal.calculateCurrentCalorie(),
+                dailyMeal.calculateCurrentCarbohydrate(),
+                dailyMeal.calculateCurrentProtein(),
+                dailyMeal.calculateCurrentFat());
     }
 }