Merge pull request #79 from Phonesonal-Trainer/ica/feat/home#4

icarus010616 · web-flow · commit 85ad0e350235 · 2025-08-08T00:25:44.000+09:00
Ica/feat/home#4
diff --git a/src/main/java/Phonesonal/PhoneBE/repository/RecommendMealRepository.java b/src/main/java/Phonesonal/PhoneBE/repository/RecommendMealRepository.java
@@ -45,6 +45,6 @@ List<RecommendMeal> findByGoalPeriodAndDateAndMealTimeAndComplete(
 
     //홈화면 목표 칼로리를 위한 데이터
     @Query("SELECT rm FROM RecommendMeal rm JOIN FETCH rm.food WHERE rm.user.id = :userId AND rm.date = :date")
-    List<RecommendMeal> findWithFoodByUserIdAndDate(@Param("userId") Long userId, @Param("date") LocalDate date);
+    List<RecommendMeal> findWithFoodByUserIdAndDate(@Param("userId") Long userId, @Param("date") LocalDate date,  @Param("goalPeriodId") Long goalPeriodId);
 
 }
diff --git a/src/main/java/Phonesonal/PhoneBE/repository/UserExerciseRepository.java b/src/main/java/Phonesonal/PhoneBE/repository/UserExerciseRepository.java
@@ -1,8 +1,5 @@
 package Phonesonal.PhoneBE.repository;
 
-import Phonesonal.PhoneBE.domain.User;
-import Phonesonal.PhoneBE.domain.common.GoalPeriod;
-import Phonesonal.PhoneBE.domain.enums.exercise.ExerciseType;
 import Phonesonal.PhoneBE.domain.mapping.UserExercise;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -33,6 +30,6 @@ List<UserExercise> findByUserIdAndGoalPeriodIdAndExerciseDateBetween(
 
     //홈화면 조회시 필요한 추천 운동에 대한 칼로리소비 데이터 끌어오기
     @Query("SELECT ue FROM UserExercise ue JOIN FETCH ue.exercise WHERE ue.user.id = :userId AND ue.exerciseDate = :exerciseDate")
-    List<UserExercise> findWithExerciseByUserIdAndDate(@Param("userId") Long userId, @Param("exerciseDate") LocalDate exerciseDate);
+    List<UserExercise> findWithExerciseByUserIdAndDate(@Param("userId") Long userId, @Param("exerciseDate") LocalDate exerciseDate, @Param("goalPeriodId") Long goalPeriodId);
 
 }
diff --git a/src/main/java/Phonesonal/PhoneBE/repository/WeightRecordRepository.java b/src/main/java/Phonesonal/PhoneBE/repository/WeightRecordRepository.java
@@ -14,6 +14,8 @@ public interface WeightRecordRepository extends JpaRepository<WeightRecord, Long
     @Query(value = "SELECT * FROM weight_record WHERE user_id = :userId ORDER BY record_date DESC LIMIT 1", nativeQuery = true)
     Optional<WeightRecord> findLatestByUserId(@Param("userId") Long userId);
 
+
+
     List<WeightRecord> findByUserIdAndGoalPeriodIdAndRecordDateBetween(
             Long userId,
             Long goalPeriodId,
diff --git a/src/main/java/Phonesonal/PhoneBE/service/Home/HomeServiceImpl.java b/src/main/java/Phonesonal/PhoneBE/service/Home/HomeServiceImpl.java
@@ -25,22 +25,21 @@
 
 @Service
 @RequiredArgsConstructor
-public class HomeServiceImpl implements HomeCommandService {
+public class HomeServiceImpl {
 
     private final UserRepository userRepository;
     private final RecommendMealRepository recommendMealRepository;
     private final UserMealRepository userMealRepository;
     private final DiagnosisRepository diagnosisRepository;
     private final DailyExerciseRecordRepository dailyExerciseRecordRepository;
-    private final WeightRecordRepository weightRecordRepository;
     private final UserExerciseRepository userExerciseRepository;
     private final DiagnosisRepository diagnosesRepository;
     private final ExerciseSetRepository exerciseSetRepository;
 
     //추천 운동 소모 칼로리
     @Transactional(readOnly = true)
-    public int getBurnedCaloriesOnDate(Long user, LocalDate date) {
-        List<UserExercise> exercises = userExerciseRepository.findWithExerciseByUserIdAndDate(user, date);
+    public int getBurnedCaloriesOnDate(Long user, LocalDate date, Long goalPeriodId) {
+        List<UserExercise> exercises = userExerciseRepository.findWithExerciseByUserIdAndDate(user, date, goalPeriodId);
 
         return exercises.stream()
                 .filter(userExercise -> userExercise.getExercise() != null && !userExercise.getExercise().getId().equals(999999L)) // 커스텀 운동 제외
@@ -61,8 +60,8 @@ public int getBurnedCaloriesOnDate(Long user, LocalDate date) {
                 .sum();
     }
     //추천 칼로리
-    public double getRecommendedCaloriesByDate(Long userId,LocalDate date) {
-        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date);
+    public double getRecommendedCaloriesByDate(Long userId,LocalDate date, Long goalPeriodId) {
+        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date, goalPeriodId);
 
         double totalCalories = recommandedMeals.stream()
                 .mapToDouble(recommendMeal -> recommendMeal.getFood().getCalorie() != null ? recommendMeal.getFood().getCalorie() : 0)
@@ -72,8 +71,8 @@ public double getRecommendedCaloriesByDate(Long userId,LocalDate date) {
     }
 
     //추천 단백질 합계
-    public double getRecommendedProteinByDate(Long userId,LocalDate date) {
-        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date);
+    public double getRecommendedProteinByDate(Long userId,LocalDate date, Long goalPeriodId) {
+        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date,goalPeriodId);
 
         double totalCalories = recommandedMeals.stream()
                 .mapToDouble(recommendMeal -> recommendMeal.getFood().getProtein() != null ? recommendMeal.getFood().getProtein() : 0)
@@ -83,8 +82,8 @@ public double getRecommendedProteinByDate(Long userId,LocalDate date) {
     }
 
     //추천 탄수화물 합계
-    public double getRecommendedCarbByDate(Long userId,LocalDate date) {
-        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date);
+    public double getRecommendedCarbByDate(Long userId,LocalDate date, Long goalPeriodId) {
+        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date,goalPeriodId);
 
         double totalCalories = recommandedMeals.stream()
                 .mapToDouble(recommendMeal -> recommendMeal.getFood().getCarb() != null ? recommendMeal.getFood().getCarb() : 0)
@@ -93,8 +92,8 @@ public double getRecommendedCarbByDate(Long userId,LocalDate date) {
         return totalCalories;
     }
     //추천 지방 합계
-    public double getRecommendedFatByDate(Long userId,LocalDate date) {
-        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date);
+    public double getRecommendedFatByDate(Long userId,LocalDate date, Long goalPeriodId) {
+        List<RecommendMeal> recommandedMeals = recommendMealRepository.findWithFoodByUserIdAndDate(userId,date,goalPeriodId);
 
         double totalCalories = recommandedMeals.stream()
                 .mapToDouble(recommendMeal -> recommendMeal.getFood().getFat() != null ? recommendMeal.getFood().getFat() : 0)
@@ -231,17 +230,14 @@ public String todayComment(LocalDate date){
     }
 
 
-    public HomeResultDTO.HomeMainDTO getHomeData(Long userId) {
+    public HomeResultDTO.HomeMainDTO getHomeData(Long userId, Long goalPeriodId) {
         User user = userRepository.getReferenceById(userId);
         // 기존 진단이 있는지 확인
         Optional<Diagnosis> existingDiagnosis = diagnosisRepository.findByUserId(userId);
-        Optional<WeightRecord> recordedWeight = weightRecordRepository.findById(userId);
-
-        
         LocalDate date = LocalDate.now();
 
-        double recommendedCalories = getRecommendedCaloriesByDate(userId, date);//추천 섭취 칼로리
-        int recommendedBurnedCalories = getBurnedCaloriesOnDate(userId, date);//추천 소비 칼로리
+        double recommendedCalories = getRecommendedCaloriesByDate(userId, date,goalPeriodId);//추천 섭취 칼로리
+        int recommendedBurnedCalories = getBurnedCaloriesOnDate(userId, date,goalPeriodId);//추천 소비 칼로리
         double todayConsumedCalories = getTodayConsumedCaloriesByDate(userId, date);// 오늘 섭취한 칼로리
         int todayBurnedCalories = getTodayCaloriesBurnedByUser(userId, date);//오늘 소비한 칼로리
 
@@ -250,18 +246,9 @@ public HomeResultDTO.HomeMainDTO getHomeData(Long userId) {
         //추천 식단의 총 칼로리 - 추천 운동의 총 소비 칼로리
         double targetCalories = recommendedCalories-recommendedBurnedCalories;
 
-        //목표 몸무게 (현재 몸무게는 생성일자 기준으로 가장 빠른 데이터로 출력 추가로 입력 api기능 구현해야함)
-        BigDecimal currentWeight = recordedWeight
-                .map(WeightRecord::getWeight)
-                .orElse(BigDecimal.ZERO);
         BigDecimal targetWeight = existingDiagnosis
                 .map(Diagnosis::getTargetWeight)
                 .orElse(BigDecimal.ZERO); // 값이 없으면 0으로 기본 처리
-
-        int caloriePercentage = (int)(todayConsumedCalories/recommendedCalories);
-        int exercisePercentage = (int)(todayBurnedCalories/recommendedCalories);
-        String exerciseStatus = HomeExercisePercentageStatus(exercisePercentage);
-        String caloriestatus = HomeMealPercentageStatus(caloriePercentage);
         int presentWeek = calculateWeek(user.getCreated_at().toLocalDate(), date);//유저 생성시간 기준으로 구현
         String comment = todayComment(date);
 
@@ -270,51 +257,62 @@ public HomeResultDTO.HomeMainDTO getHomeData(Long userId) {
                 .userId(userId)
                 .targetCalories(targetCalories)
                 .todayCalories(todayCalories)
-                .caloriePercentage(caloriePercentage)
-                .exercisePercentage(exercisePercentage)
-                .caloriestatus(caloriestatus)
-                .exercisestatus(exerciseStatus)
                 .date(date)
                 .presentWeek(presentWeek)
                 .targetWeight(targetWeight)
-                .currentWeight(currentWeight)
                 .comment(comment)
                 .build();
     }
 
-    public HomeResultDTO.HomeExerciseDTO getHomeExercise(Long userId) {
+    public HomeResultDTO.HomeExerciseDTO getHomeExercise(Long userId, Long goalPeriodId) {
         String focusedBodyPart = "하체"; // 더미 데이터 집중 부위
         int anaerobicExerciseTime =getTodayAnaerobicExerciseTimeByDate(userId); // 무산소 시간
         int aerobicExerciseTime = getTodayAerobicExerciseTimeByDate(userId); // 유산소 시간
+        int todayBurnedCalories = getTodayCaloriesBurnedByUser(userId, LocalDate.now());//오늘 칼로리 소비량
+        int todayRecommanedBurnedCalories = getBurnedCaloriesOnDate(userId, LocalDate.now(),goalPeriodId);//추천 칼로리 소비량
+        int exercisePercentage = (todayBurnedCalories/todayRecommanedBurnedCalories);//현재 byzero 문제 발생
+        String exerciseStatus = HomeExercisePercentageStatus(exercisePercentage);
 
         return HomeResultDTO.HomeExerciseDTO.builder()
+                .todayBurnedCalories(todayBurnedCalories)
+                .todayRecommanedBurnedCalories(todayRecommanedBurnedCalories)
                 .anaerobicExerciseTime(anaerobicExerciseTime)
                 .aerobicExerciseTime(aerobicExerciseTime)
                 .focusedBodyPart(focusedBodyPart)
+                .exerciseStatus(exerciseStatus)
+                .exercisePercentage(exercisePercentage)
                 .build();
     }
 
-    public HomeResultDTO.HomeMealPlanDTO getHomeMealPlan(Long userId) {
+    public HomeResultDTO.HomeMealPlanDTO getHomeMealPlan(Long userId, Long goalPeriodId) {
         LocalDate date = LocalDate.now();
 
-        double calorie = getTodayConsumedCaloriesByDate(userId, date);
-        double carb = getRecommendedCarbByDate(userId, date);
-        double protein = getRecommendedProteinByDate(userId,date);
-        double fat = getRecommendedFatByDate(userId,date);
+        double recommendedCalories = getRecommendedCaloriesByDate(userId, date, goalPeriodId);//추천 칼로리 섭취량
+        double calorie = getTodayConsumedCaloriesByDate(userId, date);//오늘 섭취한 총 칼로리
+        double carb = getRecommendedCarbByDate(userId, date, goalPeriodId);//추천된 탄수화물 그램수
+        double protein = getRecommendedProteinByDate(userId,date, goalPeriodId);//오늘 추천된 단백질 그램수
+        double fat = getRecommendedFatByDate(userId,date, goalPeriodId);//오늘 추천된 지방 그램수
+        int caloriePercentage = (int)(calorie/recommendedCalories);
+        String calorieStatus = HomeMealPercentageStatus(caloriePercentage);
+
+
 
         return HomeResultDTO.HomeMealPlanDTO.builder()
-                .calorie(calorie)
+                .todayRecommendedCalories(recommendedCalories)
+                .todayConsumedCalorie(calorie)
+                .calorieStatus(calorieStatus)
+                .caloriePercentage(caloriePercentage)
                 .carb(carb)
                 .fat(fat)
                 .protein(protein)
                 .build();
     }
 
-    public HomeFullResponseDTO getHomeFullResponse(Long userId) {
+    public HomeFullResponseDTO getHomeFullResponse(Long userId, Long goalPeriodId) {
         return HomeFullResponseDTO.builder()
-                .main(getHomeData(userId))
-                .exercise(getHomeExercise(userId))
-                .meal(getHomeMealPlan(userId))
+                .main(getHomeData(userId,goalPeriodId))
+                .exercise(getHomeExercise(userId,goalPeriodId))
+                .meal(getHomeMealPlan(userId,goalPeriodId))
                 .build();
     }
 }
diff --git a/src/main/java/Phonesonal/PhoneBE/web/controller/HomeController.java b/src/main/java/Phonesonal/PhoneBE/web/controller/HomeController.java
@@ -30,7 +30,7 @@ public class HomeController {
     @GetMapping("/{userId}/main")
     @Operation(summary = "홈화면 조회 API", description = "홈화면")
     public ApiResponse<HomeFullResponseDTO> homeFullResponse(@AuthenticationPrincipal CustomUserDetails userDetails) {
-        HomeFullResponseDTO homeResponse = homeService.getHomeFullResponse(userDetails.getUser().getId());
+        HomeFullResponseDTO homeResponse = homeService.getHomeFullResponse(userDetails.getUser().getId(),userDetails.getUser().getCurrentGoalPeriodId());
         return ApiResponse.onSuccess(homeResponse);
     }
 
diff --git a/src/main/java/Phonesonal/PhoneBE/web/dto/Home/HomeResultDTO.java b/src/main/java/Phonesonal/PhoneBE/web/dto/Home/HomeResultDTO.java
@@ -19,12 +19,7 @@ public static class HomeMainDTO{
             private Long userId;
             private double targetCalories;
             private double todayCalories;
-            private int caloriePercentage;
-            private int exercisePercentage;
             private BigDecimal targetWeight;
-            private BigDecimal currentWeight;
-            private String caloriestatus;
-            private String exercisestatus;
             private String comment;
             private int presentWeek;
             private LocalDate date;
@@ -34,9 +29,13 @@ public static class HomeMainDTO{
         @Getter
         @AllArgsConstructor
         public static class HomeExerciseDTO{
+            private int todayBurnedCalories;
+            private int todayRecommanedBurnedCalories;
             private int anaerobicExerciseTime;
             private int aerobicExerciseTime;
+            private int exercisePercentage;
             private String focusedBodyPart;
+            private String exerciseStatus;
 
 
         }
@@ -45,16 +44,20 @@ public static class HomeExerciseDTO{
         @Getter
         @AllArgsConstructor
         public static class HomeMealPlanDTO{
-            private double calorie;
+            private double todayRecommendedCalories;
+            private double todayConsumedCalorie;
             private double carb;
             private double protein;
             private double fat;
+            private int caloriePercentage;
+            private String calorieStatus;
         }
-
+/*
         @Builder
         @Getter
         @AllArgsConstructor
         public static class HomeUserWeightDTO{
             private int userWeight;
         }
+        */
     }

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ List<RecommendMeal> findByGoalPeriodAndDateAndMealTimeAndComplete(`
`45`	`45`
`46`	`46`	`//홈화면 목표 칼로리를 위한 데이터`
`47`	`47`	`@Query("SELECT rm FROM RecommendMeal rm JOIN FETCH rm.food WHERE rm.user.id = :userId AND rm.date = :date")`
`48`		`- List<RecommendMeal> findWithFoodByUserIdAndDate(@Param("userId") Long userId, @Param("date") LocalDate date);`
	`48`	`+ List<RecommendMeal> findWithFoodByUserIdAndDate(@Param("userId") Long userId, @Param("date") LocalDate date, @Param("goalPeriodId") Long goalPeriodId);`
`49`	`49`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class HomeController {`
`30`	`30`	`@GetMapping("/{userId}/main")`
`31`	`31`	`@Operation(summary = "홈화면 조회 API", description = "홈화면")`
`32`	`32`	`public ApiResponse<HomeFullResponseDTO> homeFullResponse(@AuthenticationPrincipal CustomUserDetails userDetails) {`
`33`		`- HomeFullResponseDTO homeResponse = homeService.getHomeFullResponse(userDetails.getUser().getId());`
	`33`	`+ HomeFullResponseDTO homeResponse = homeService.getHomeFullResponse(userDetails.getUser().getId(),userDetails.getUser().getCurrentGoalPeriodId());`
`34`	`34`	`return ApiResponse.onSuccess(homeResponse);`
`35`	`35`	`}`
`36`	`36`