Merge branch 'dev' into feat/96

Author: loseminho

.github/workflows/backend-ci.yml

@@ -12,6 +12,12 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
 
+    services:
+      redis:
+        image: redis:7
+        ports:
+          - 6379:6379
+
     steps:
       # 저장소 체크아웃
       - name: Checkout repository

build.gradle.kts

@@ -29,6 +29,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-websocket")
     implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.boot:spring-boot-starter-mail")
 
     // Database & JPA
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")

src/main/java/com/back/domain/chat/room/controller/RoomChatWebSocketController.java

@@ -7,6 +7,7 @@
 import com.back.global.exception.CustomException;
 import com.back.global.security.user.CustomUserDetails;
 import com.back.domain.chat.room.service.RoomChatService;
+import com.back.global.websocket.util.WebSocketAuthHelper;
 import com.back.global.websocket.util.WebSocketErrorHelper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -29,6 +30,7 @@ public class RoomChatWebSocketController {
 
     private final RoomChatService roomChatService;
     private final SimpMessagingTemplate messagingTemplate;
+    private final WebSocketAuthHelper authHelper;
     private final WebSocketErrorHelper errorHelper;
 
     /**
@@ -43,7 +45,8 @@ public void handleRoomChat(@DestinationVariable Long roomId,
 
         try {
             // WebSocket에서 인증된 사용자 정보 추출
-            CustomUserDetails userDetails = extractUserDetails(principal);
+            CustomUserDetails userDetails = authHelper.extractUserDetails(principal);
+
             if (userDetails == null) {
                 errorHelper.sendUnauthorizedError(headerAccessor.getSessionId());
                 return;
@@ -101,7 +104,8 @@ public void clearRoomChat(@DestinationVariable Long roomId,
             log.info("WebSocket 채팅 일괄 삭제 요청 - roomId: {}", roomId);
 
             // 사용자 인증 확인
-            CustomUserDetails userDetails = extractUserDetails(principal);
+            CustomUserDetails userDetails = authHelper.extractUserDetails(principal);
+
             if (userDetails == null) {
                 errorHelper.sendUnauthorizedError(headerAccessor.getSessionId());
                 return;
@@ -148,15 +152,4 @@ public void clearRoomChat(@DestinationVariable Long roomId,
         }
     }
 
-    // WebSocket Principal에서 CustomUserDetails 추출
-    private CustomUserDetails extractUserDetails(Principal principal) {
-        if (principal instanceof Authentication auth) {
-            Object principalObj = auth.getPrincipal();
-            if (principalObj instanceof CustomUserDetails userDetails) {
-                return userDetails;
-            }
-        }
-        return null;
-    }
-
 }

src/main/java/com/back/domain/study/plan/controller/StudyPlanController.java

@@ -31,10 +31,11 @@ public class StudyPlanController {
                     " 이후 반복되는 계획들은 가상 계획으로서 db에는 없지만 조회 시 가상으로 생성됩니다")
 
     public ResponseEntity<RsData<StudyPlanResponse>> createStudyPlan(
-            // 로그인 유저 정보 받기 @AuthenticationPrincipal CustomUserDetails user,
+            // 로그인 유저 정보 받기
+            @AuthenticationPrincipal CustomUserDetails user,
             @RequestBody StudyPlanRequest request) {
-        //커스텀 디테일 구현 시 사용 int userId = user.getId();
-        Long userId = 1L; // 임시로 userId를 1로 설정
+        //커스텀 디테일 구현 시 사용
+        Long userId = user.getUserId();
         StudyPlanResponse response = studyPlanService.createStudyPlan(userId, request);
         return ResponseEntity.ok(RsData.success("학습 계획이 성공적으로 생성되었습니다.", response));
     }
@@ -49,9 +50,8 @@ public ResponseEntity<RsData<StudyPlanResponse>> createStudyPlan(
     public ResponseEntity<RsData<StudyPlanListResponse>> getStudyPlansForDate(
             @AuthenticationPrincipal CustomUserDetails user,
             @PathVariable @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
-        // 유저 아이디 추출. 지금은 임시값 적용
-        // Long userId = user.getId();
-        Long userId = 1L; // 임시로 userId를 1로 설정
+        // 유저 아이디 추출.
+        Long userId = user.getUserId();
 
         List<StudyPlanResponse> plans = studyPlanService.getStudyPlansForDate(userId, date);
         StudyPlanListResponse response = new StudyPlanListResponse(date, plans, plans.size());
@@ -66,11 +66,11 @@ public ResponseEntity<RsData<StudyPlanListResponse>> getStudyPlansForDate(
             description = "기간에 해당하는 모든 학습 계획을 조회합니다."
     )
     public ResponseEntity<RsData<List<StudyPlanResponse>>> getStudyPlansForPeriod(
-            // @AuthenticationPrincipal CustomUserDetails user,
+            @AuthenticationPrincipal CustomUserDetails user,
             @RequestParam("start") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
             @RequestParam("end") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) {
-        // Long userId = user.getId();
-        Long userId = 1L; // 임시
+
+        Long userId = user.getUserId();
 
         List<StudyPlanResponse> plans = studyPlanService.getStudyPlansForPeriod(userId, startDate, endDate);
 
@@ -90,12 +90,11 @@ public ResponseEntity<RsData<List<StudyPlanResponse>>> getStudyPlansForPeriod(
                     "클라이언트에서는 paln에 repeat_rule이 있으면 반복 계획으로 간주하고 반드시 apply_scope를 쿼리 파라미터로 넘겨야 합니다." +
     "repeat_rule이 없으면 단발성 계획으로 간주하여 수정 범위를 설정 할 필요가 없으므로 apply_scope를 넘기지 않아도 됩니다.")
     public ResponseEntity<RsData<StudyPlanResponse>> updateStudyPlan(
-            // @AuthenticationPrincipal CustomUserDetails user,
+            @AuthenticationPrincipal CustomUserDetails user,
             @PathVariable Long planId,
             @RequestBody StudyPlanRequest request,
-            @RequestParam(required = false, defaultValue = "THIS_ONLY") ApplyScope applyScope) {
-        // Long userId = user.getId();
-        Long userId = 1L; // 임시
+            @RequestParam(name = "applyScope", required = true) ApplyScope applyScope) {
+        Long userId = user.getUserId();
 
         StudyPlanResponse response = studyPlanService.updateStudyPlan(userId, planId, request, applyScope);
         return ResponseEntity.ok(RsData.success("학습 계획이 성공적으로 수정되었습니다.", response));
@@ -113,11 +112,11 @@ public ResponseEntity<RsData<StudyPlanResponse>> updateStudyPlan(
                     "클라이언트에서는 paln에 repeat_rule이 있으면 반복 계획으로 간주하고 반드시 apply_scope를 쿼리 파라미터로 넘겨야 합니다." +
                     "repeat_rule이 없으면 단발성 계획으로 간주하여 삭제 범위를 설정 할 필요가 없으므로 apply_scope를 넘기지 않아도 됩니다.")
     public ResponseEntity<RsData<Void>> deleteStudyPlan(
-            // @AuthenticationPrincipal CustomUserDetails user,
+            @AuthenticationPrincipal CustomUserDetails user,
             @PathVariable Long planId,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate selectedDate,
-            @RequestParam(required = false) ApplyScope applyScope) {
-        Long userId = 1L; // 임시
+            @RequestParam(name = "applyScope", required = true) ApplyScope applyScope) {
+        Long userId = user.getUserId();
 
         studyPlanService.deleteStudyPlan(userId, planId, selectedDate, applyScope);
         return ResponseEntity.ok(RsData.success("학습 계획이 성공적으로 삭제되었습니다."));

src/main/java/com/back/domain/study/plan/dto/StudyPlanRequest.java

@@ -9,6 +9,8 @@
 import lombok.Setter;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Getter
 @Setter
@@ -35,7 +37,7 @@ public class StudyPlanRequest {
     public static class RepeatRuleRequest {
         private Frequency frequency;
         private Integer intervalValue;
-        private String byDay; // "MON" 형태의 문자열
+        private List<String> byDay = new ArrayList<>();  // 문자열 리스트
 
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
         private String untilDate; // "2025-12-31" 형태

src/main/java/com/back/domain/study/plan/dto/StudyPlanResponse.java

@@ -12,6 +12,7 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -42,11 +43,14 @@ public class StudyPlanResponse {
     public static class RepeatRuleResponse {
         private Frequency frequency;
         private Integer repeatInterval;
-        private String byDay; // "MON" 형태의 문자열
+        // byDay 필드는 이미 List<String>으로 선언되어 있음.
+        private List<String> byDay = new ArrayList<>();  // "MON" 형태의 문자열 리스트
 
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
         private LocalDate untilDate;
 
+        // 엔티티 생성자: 그대로 유지
+
         public RepeatRuleResponse(com.back.domain.study.plan.entity.RepeatRule repeatRule) {
             if (repeatRule != null) {
                 this.frequency = repeatRule.getFrequency();
@@ -56,13 +60,13 @@ public RepeatRuleResponse(com.back.domain.study.plan.entity.RepeatRule repeatRul
             }
         }
 
-        // 요일을 리스트로 접근 ("MON,TUE" -> [MON, TUE])
         public List<DayOfWeek> getByDaysList() {
             if (byDay == null || byDay.isEmpty()) {
                 return List.of();
             }
-            return Arrays.stream(byDay.split(","))
-                    .map(String::trim)
+
+            // List<String>의 각 요소를 DayOfWeek enum으로 변환하여 반환
+            return byDay.stream()
                     .map(com.back.domain.study.plan.entity.DayOfWeek::valueOf)
                     .collect(Collectors.toList());
         }

src/main/java/com/back/domain/study/plan/entity/RepeatRule.java

@@ -8,6 +8,8 @@
 import lombok.Setter;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
 @Getter
@@ -25,9 +27,9 @@ public class RepeatRule extends BaseEntity {
     @Column(name = "interval_value", nullable = false)
     private int repeatInterval;
 
-    //요일은 계획 날짜에 따라 자동 설정
+    //요일은 응답에 들어있는 요일을 그대로 저장 (예: "WED")
     @Column(name = "by_day")
-    private String byDay;
+    private List<String> byDay = new ArrayList<>();
 
     private LocalDate untilDate;
 }

src/main/java/com/back/domain/study/plan/entity/RepeatRuleEmbeddable.java

@@ -9,6 +9,8 @@
 import lombok.Setter;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
 
 @Embeddable
 @Getter
@@ -20,6 +22,6 @@ public class RepeatRuleEmbeddable {
     private Frequency frequency;
 
     private Integer intervalValue;
-    private String byDay;
+    private List<String> byDay = new ArrayList<>();
     private LocalDate untilDate; // LocalDateTime → LocalDate 변경
 }

src/main/java/com/back/domain/study/plan/entity/StudyPlanException.java

@@ -58,6 +58,7 @@ public enum ExceptionType {
     }
 
     @Embedded
+    @Column(name = "modified_repeat_rule")
     @AttributeOverrides({
             @AttributeOverride(name = "frequency", column = @Column(name = "modified_frequency")),
             @AttributeOverride(name = "intervalValue", column = @Column(name = "modified_repeat_interval")),

src/main/java/com/back/domain/study/plan/repository/StudyPlanExceptionRepository.java

@@ -3,6 +3,7 @@
 import com.back.domain.study.plan.entity.ApplyScope;
 import com.back.domain.study.plan.entity.StudyPlanException;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -22,7 +23,7 @@ public interface StudyPlanExceptionRepository extends JpaRepository<StudyPlanExc
     List<StudyPlanException> findByStudyPlanIdAndApplyScopeAndExceptionDateBefore(
             @Param("planId") Long planId,
             @Param("applyScope") ApplyScope applyScope,
-            @Param("targetDate") LocalDateTime targetDate);
+            @Param("targetDate") LocalDate targetDate);
 // 특정 계획의 특정 기간 동안(start~end)의 예외를 조회
     @Query("SELECT spe FROM StudyPlanException spe WHERE spe.studyPlan.id = :planId " +
             "AND spe.exceptionDate BETWEEN :startDate AND :endDate " +
@@ -35,4 +36,10 @@ List<StudyPlanException> findByStudyPlanIdAndExceptionDateBetween(@Param("planId
             "AND DATE(spe.exceptionDate) = DATE(:targetDate)")
     Optional<StudyPlanException> findByPlanIdAndDate(@Param("planId") Long planId,
                                                      @Param("targetDate") LocalDate targetDate);
+
+    // 특정 계획의 특정 날짜 이후 예외 모두 삭제
+    @Modifying
+    @Query("DELETE FROM StudyPlanException spe WHERE spe.studyPlan.id = :planId AND spe.exceptionDate > :date")
+    void deleteByStudyPlanIdAndExceptionDateAfter(@Param("planId") Long planId, @Param("date") LocalDate date);
+
 }