Merge pull request #66 from Phonesonal-Trainer/mong/feat/report#2

리포트 기능 추가

Author: gradeten

src/main/java/Phonesonal/PhoneBE/apiPayload/code/status/ErrorStatus.java

@@ -32,6 +32,7 @@ public enum ErrorStatus implements BaseErrorCode {
 
     // 목표 관리 에러
     INVALID_GOAL_PERIOD(HttpStatus.BAD_REQUEST, "GOAL4002","해당 목표 기간이 존재하지 않습니다."),
+    INVALID_WEEK(HttpStatus.BAD_REQUEST, "GOAL4003","범위에 해당하지 않는 주차입니다."),
 
     //운동 관련 에러
     EXERCISE_NOT_FOUND(HttpStatus.NOT_FOUND, "EXERCISE4041", "운동을 찾을 수 없습니다."),

src/main/java/Phonesonal/PhoneBE/apiPayload/code/util/DateUtil.java

@@ -16,4 +16,23 @@ public static int calculateWeek(LocalDate startDate, LocalDate now) {
         long weeksBetween = ChronoUnit.WEEKS.between(startMonday, currentMonday);
         return (int) weeksBetween+1;
     }
+
+    public static LocalDate[] getWeekDateRange(LocalDate startDate, LocalDate endDate, int week) {
+        // 기준일의 주의 월요일 구하기
+        LocalDate startMonday = startDate.with(DayOfWeek.MONDAY);
+
+        // 입력된 주차에 해당하는 주의 월요일 구하기
+        LocalDate targetMonday = startMonday.plusWeeks(week - 1);
+        LocalDate targetSunday = targetMonday.plusDays(6);
+
+        // endDate를 넘지 않도록 조정
+        if (targetMonday.isAfter(endDate)) {
+            return null; // 유효하지 않은 주차
+        }
+        if (targetSunday.isAfter(endDate)) {
+            targetSunday = endDate; // 범위를 endDate까지 제한
+        }
+
+        return new LocalDate[]{targetMonday, targetSunday};
+    }
 }

src/main/java/Phonesonal/PhoneBE/domain/enums/ExerciseFeedback.java

@@ -1,5 +1,5 @@
 package Phonesonal.PhoneBE.domain.enums;
 
 public enum ExerciseFeedback {
-    LONG, SHORT, HIGH, LOW;
+    MANY, LESS, HIGH, LOW, DISLIKE;
 }

src/main/java/Phonesonal/PhoneBE/domain/enums/FoodFeedback.java

@@ -1,5 +1,5 @@
 package Phonesonal.PhoneBE.domain.enums;
 
 public enum FoodFeedback {
-    LESS, MUCH, DISLIKE;
+    LESS, MANY, DISLIKE;
 }

src/main/java/Phonesonal/PhoneBE/repository/DailyExerciseRecordRepository.java

@@ -5,8 +5,10 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
 public interface DailyExerciseRecordRepository extends JpaRepository<DailyExerciseRecord, Long> {
     Optional<DailyExerciseRecord> findByUserAndDate(User user, LocalDate date);
+    List<DailyExerciseRecord> findAllByUserIdAndDateBetween(Long userId, LocalDate start, LocalDate end);
 }

src/main/java/Phonesonal/PhoneBE/repository/FeedbackRepository.java

@@ -8,7 +8,7 @@
 
 public interface FeedbackRepository extends JpaRepository<Feedback, Long> {
     Optional<Feedback> findByUserIdAndGoalPeriod_IdAndWeek(Long userId, Long goalPeriodId, Integer week);
-
+    boolean existsByUserIdAndGoalPeriod_IdAndWeek(Long userId, Long goalPeriodId, int week);
 
 
 }

src/main/java/Phonesonal/PhoneBE/repository/RecommendMealRepository.java

@@ -17,6 +17,12 @@ public interface RecommendMealRepository extends JpaRepository<RecommendMeal, Lo
 
     // 특정 날짜, mealTime 별 (식단 플랜)
     List<RecommendMeal> findByGoalPeriodAndDateAndMealTime(GoalPeriod goalPeriod, LocalDate date, MealTime mealTime);
+    List<RecommendMeal> findByUserIdAndGoalPeriodIdAndDateBetweenAndComplete(
+            Long userId, Long goalPeriodId, LocalDate weekStart, LocalDate weekEnd, CompleteStatus completeStatus
+    );
+    List<RecommendMeal> findByUserIdAndGoalPeriodIdAndDateBetween(
+            Long userId, Long goalPeriodId, LocalDate weekStart, LocalDate weekEnd
+    );
 
     // completeStatus 수정용
     @Modifying(clearAutomatically = true)

src/main/java/Phonesonal/PhoneBE/repository/UserExerciseRepository.java

@@ -1,5 +1,7 @@
 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;
@@ -19,6 +21,10 @@ public interface UserExerciseRepository extends JpaRepository<UserExercise, Long
     // 사용자의 북마크된 운동 목록 조회
     List<UserExercise> findByUserIdAndBookmarkTrue(Long userId);
 
+    List<UserExercise> findByUserIdAndGoalPeriodIdAndExerciseDateBetween(
+            Long userId, Long goalPeriodId, LocalDate start, LocalDate end
+    );
+
     // 특정 사용자의 특정 운동 조회
     @Query("SELECT ue FROM UserExercise ue WHERE ue.user.id = :userId AND ue.exercise.id = :exerciseId")
     List<UserExercise> findByUserIdAndExerciseId(@Param("userId") Long userId, @Param("exerciseId") Long exerciseId);

src/main/java/Phonesonal/PhoneBE/repository/UserMealRepository.java

@@ -15,6 +15,9 @@
 public interface UserMealRepository extends JpaRepository<UserMeal, Long> {
     // 특정 날짜, 식사 시간 별 조회 (추가 식단)
     List<UserMeal> findByGoalPeriodAndDateAndMealTime(GoalPeriod goalPeriod, LocalDate date, MealTime mealTime);
+    List<UserMeal> findByUserIdAndGoalPeriodIdAndDateBetween(
+            Long userId, Long goalPeriodId, LocalDate weekStart, LocalDate weekEnd
+    );
 
     //홈화면 오늘 섭취 칼로리를 위한 데이터
     @Query("SELECT um FROM UserMeal um JOIN FETCH um.food WHERE um.user.id = :userId AND um.date = :date")

src/main/java/Phonesonal/PhoneBE/repository/WeightRecordRepository.java

@@ -5,10 +5,19 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 
 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,
+            LocalDateTime start,
+            LocalDateTime end
+    );
 }