[T3-98] 루틴 조회 API 수정 (#23)

* feat: 변경 구분코드 추가

* feat: 루틴 조회 API

* feat: 수정여부 컬럼 추가

* chore: 1차 배포 최종 init sql

* fix: ddl 변경에 따른 수

* fix: ddl 변경에 따른 수정

* fix: 온보딩 API 수

* fix: 루틴 조회 쿼리파라미터로 수정

* fix: 홈 루틴 조회 API 수정

Author: thisishwan2

src/main/java/bitnagil/bitnagil_backend/changedRoutine/domain/ChangedRoutine.java

@@ -1,9 +1,8 @@
 package bitnagil.bitnagil_backend.changedRoutine.domain;
 
+import bitnagil.bitnagil_backend.changedRoutine.domain.enums.ChangedDivCode;
 import bitnagil.bitnagil_backend.global.entity.BaseTimeEntity;
 import bitnagil.bitnagil_backend.global.entity.HistoryPk;
-import bitnagil.bitnagil_backend.routine.domain.Routine;
-import bitnagil.bitnagil_backend.user.domain.User;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
@@ -14,6 +13,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.UUID;
 
 /**
  * 규칙적인 류틴에 대해 일시적인 변경이 발생한 루틴에 대해 관리하는 엔티티입니다.
@@ -49,33 +49,29 @@ public class ChangedRoutine extends BaseTimeEntity {
     @NotNull
     private LocalDateTime historyEndDateTime; // 이력 종료일시
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumns({
-        @JoinColumn(name = "user_id", referencedColumnName = "user_id"),
-        @JoinColumn(name = "user_history_seq", referencedColumnName = "history_seq")
-    })
+    @Enumerated(EnumType.STRING)
+    @Column(columnDefinition = "varchar(40)")
+    private ChangedDivCode changedDivCode; // 변경 구분 코드 (시간 변경, 내일 미루기, 오늘만 루틴 삭제 등)
+
     @NotNull
-    private User user;
+    private UUID userId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumns({
-        @JoinColumn(name = "routine_id", referencedColumnName = "routine_id"),
-        @JoinColumn(name = "routine_history_seq", referencedColumnName = "history_seq")
-    })
-    private Routine routine; // 원본 루틴
+    private UUID routineId;
 
     @Builder
     public ChangedRoutine(HistoryPk changedRoutinePk, String changedRoutineName, LocalTime changedExecutionTime,
         LocalDate originalRoutineDate, LocalDate changedRoutineDate, LocalDateTime historyStartDateTime,
-        LocalDateTime historyEndDateTime, User user, Routine routine) {
+        LocalDateTime historyEndDateTime, UUID userId, UUID routineId, ChangedDivCode changedDivCode) {
         this.changedRoutinePk = changedRoutinePk;
         this.changedRoutineName = changedRoutineName;
         this.changedExecutionTime = changedExecutionTime;
         this.originalRoutineDate = originalRoutineDate;
         this.changedRoutineDate = changedRoutineDate;
         this.historyStartDateTime = historyStartDateTime;
         this.historyEndDateTime = historyEndDateTime;
-        this.user = user;
-        this.routine = routine;
+        this.changedDivCode = changedDivCode;
+        this.userId = userId;
+        this.routineId = routineId;
     }
+
 }

src/main/java/bitnagil/bitnagil_backend/changedRoutine/domain/ChangedSubRoutine.java

@@ -10,6 +10,7 @@
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
+import java.util.UUID;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -32,13 +33,22 @@ public class ChangedSubRoutine extends BaseTimeEntity {
     @NotNull
     private LocalDateTime historyEndDateTime;
 
+    @NotNull
+    private UUID changedRoutineId; // 변경된 루틴 ID
+
+    @NotNull
+    private Integer sortOrder; // 변경서브루틴의 순서를 나타내는 필드
+
 
     @Builder
     public ChangedSubRoutine(HistoryPk changedSubRoutinePk, String changedSubRoutineName,
-        LocalDateTime historyStartDateTime, LocalDateTime historyEndDateTime) {
+        LocalDateTime historyStartDateTime, LocalDateTime historyEndDateTime, UUID changedRoutineId,
+        Integer sortOrder) {
         this.changedSubRoutinePk = changedSubRoutinePk;
         this.changedSubRoutineName = changedSubRoutineName;
         this.historyStartDateTime = historyStartDateTime;
         this.historyEndDateTime = historyEndDateTime;
+        this.changedRoutineId = changedRoutineId;
+        this.sortOrder = sortOrder;
     }
 }

src/main/java/bitnagil/bitnagil_backend/changedRoutine/domain/enums/ChangedDivCode.java

@@ -0,0 +1,17 @@
+package bitnagil.bitnagil_backend.changedRoutine.domain.enums;
+
+import bitnagil.bitnagil_backend.enums.EnumType;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum ChangedDivCode implements EnumType {
+    TODAY_CHANGE("당일 변경(ex: 루틴명, 세부루틴명, 실행시간 등)"),
+    DELAY("미루기"),
+    TODAY_DELETE("오늘만 루틴 삭제"),
+    ONBOARDING("온보딩 루틴")
+    ;
+
+    private final String description;
+}

src/main/java/bitnagil/bitnagil_backend/changedRoutine/repository/ChangedRoutineRepository.java

@@ -5,5 +5,22 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
 public interface ChangedRoutineRepository extends JpaRepository<ChangedRoutine, HistoryPk> {
+
+    /**
+     * 현재 시점을 기준으로 유저의 살아있는 변경루틴 이력을 조회
+     * historyStartDateTime < systime <= historyEndDateTime
+     */
+    List<ChangedRoutine> findByUserIdAndHistoryStartDateTimeBeforeAndHistoryEndDateTimeGreaterThanEqualAndChangedRoutineDateBetween(
+            UUID userId,
+            LocalDateTime now1,
+            LocalDateTime now2,
+            LocalDate startDate,
+            LocalDate endDate
+    );
 }

src/main/java/bitnagil/bitnagil_backend/changedRoutine/repository/ChangedSubRoutineRepository.java

@@ -5,5 +5,19 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
 public interface ChangedSubRoutineRepository extends JpaRepository<ChangedSubRoutine, HistoryPk> {
+
+    /**
+     * 현재 시점을 기준으로 살아있는 변경 서브루틴 이력을 조회
+     * historyStartDateTime < systime <= historyEndDateTime
+     */
+    List<ChangedSubRoutine> findByChangedRoutineIdAndHistoryStartDateTimeBeforeAndHistoryEndDateTimeGreaterThanEqual(
+            UUID changedRoutineId,
+            LocalDateTime now1,
+            LocalDateTime now2
+    );
 }

src/main/java/bitnagil/bitnagil_backend/global/exception/CustomException.java

@@ -2,15 +2,21 @@
 
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 /**
  * 커스텀 에외 클래스. 해당 클래스로 예외를 던져서 예외처리를 한다.
  */
 @Getter
-@RequiredArgsConstructor
 public class CustomException extends RuntimeException {
 
     private final ErrorCode errorCode;
 
+    public CustomException(ErrorCode errorCode) {
+        super(errorCode.getMessage()); // ← 메시지 설정
+        this.errorCode = errorCode;
+    }
+
+    public ErrorCode getErrorCode() {
+        return errorCode;
+    }
 }

src/main/java/bitnagil/bitnagil_backend/onboarding/domain/Onboarding.java

@@ -8,6 +8,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalTime;
+
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
@@ -17,10 +19,10 @@ public class Onboarding extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long onboardingId;
 
-    @Enumerated(EnumType.STRING)
-    @Column(columnDefinition = "varchar(40)") // mysql의 enum 타입을 사용하지 않도록 설정
+//    @Enumerated(EnumType.STRING)
+//    @Column(columnDefinition = "varchar(40)") // mysql의 enum 타입을 사용하지 않도록 설정
     @NotNull
-    private TimeSlot timeSlot;
+    private LocalTime timeSlot;
 
     @Enumerated(EnumType.STRING)
     @Column(columnDefinition = "varchar(40)")

src/main/java/bitnagil/bitnagil_backend/onboarding/domain/enums/RealOutingFrequency.java

@@ -7,10 +7,11 @@
 @RequiredArgsConstructor
 @Getter
 public enum RealOutingFrequency implements EnumType {
-    ZERO_PER_WEEK("일주일 0회"),
-    ONE_TO_TWO_PER_WEEK("일주일 1~2회"),
-    THREE_TO_FOUR_PER_WEEK("일주일 3~4회"),
-    MORE_THAN_FIVE_PER_WEEK("일주일 5회 이상"),
+
+    OFTEN("자주 외출해요"),
+    SOMETIMES("가끔 나가요"),
+    NEVER("밖에 나가지 않고 집에만 있어요"),
+    SHORT("잠깐 외출했어요");
     ;
 
     private final String description;

src/main/java/bitnagil/bitnagil_backend/onboarding/domain/enums/TargetOutingFrequency.java

@@ -7,10 +7,11 @@
 @RequiredArgsConstructor
 @Getter
 public enum TargetOutingFrequency implements EnumType {
-    ONE_TO_TWO_PER_WEEK("일주일 1~2회"),
-    THREE_TO_FOUR_PER_WEEK("일주일 3~4회"),
-    MORE_THAN_FIVE_PER_WEEK("일주일 5회 이상"),
-    UNKNOWN("아직 잘 모르겠어요"),
+
+    ONE_PER_WEEK("일주일 1회"),
+    TWO_TO_THREE_PER_WEEK("일주일 2~3회"),
+    MORE_THAN_FOUR_PER_WEEK("일주일 4회 이상"),
+    UNKNOW("아직 잘 모르겠어요"),
     ;
 
     private final String description;

src/main/java/bitnagil/bitnagil_backend/onboarding/repository/OnboardingRepository.java

@@ -4,14 +4,15 @@
 import bitnagil.bitnagil_backend.onboarding.domain.enums.EmotionType;
 import bitnagil.bitnagil_backend.onboarding.domain.enums.RealOutingFrequency;
 import bitnagil.bitnagil_backend.onboarding.domain.enums.TargetOutingFrequency;
-import bitnagil.bitnagil_backend.onboarding.domain.enums.TimeSlot;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalTime;
+
 @Repository
 public interface OnboardingRepository extends JpaRepository<Onboarding, Long> {
     Onboarding findByTimeSlotAndEmotionTypeAndRealOutingFrequencyAndTargetOutingFrequency(
-            TimeSlot timeSlot,
+            LocalTime timeSlot,
             EmotionType emotionType,
             RealOutingFrequency realOutingFrequency,
             TargetOutingFrequency targetOutingFrequency