Merge pull request #58 from YAPP-Github/feat/T3-150

yuseok0215 · web-flow · commit 4869e503e490 · 2025-08-10T23:56:00.000+09:00
[T3-150] 루틴 정보 등록 및 루틴 시작, 종료일자 기반의 루틴 생성
diff --git a/src/main/java/bitnagil/bitnagil_backend/global/swagger/ApiTags.java b/src/main/java/bitnagil/bitnagil_backend/global/swagger/ApiTags.java
@@ -8,6 +8,7 @@ public class ApiTags {
     public static final String USER_AUTH = "유저 인증 API";
     public static final String HEALTH_CHECK = "헬스체크 API";
     public static final String ROUTINE = "루틴 API";
+    public static final String ROUTINEV2 = "[v2] 루틴 API";
     public static final String ONBOARDING = "온보딩 API";
     public static final String EMOTION_MARBLE = "감정구슬 API";
     public static final String RECOMMENDED_ROUTINE = "추천 루틴 API";
diff --git a/src/main/java/bitnagil/bitnagil_backend/onboarding/service/OnboardingService.java b/src/main/java/bitnagil/bitnagil_backend/onboarding/service/OnboardingService.java
@@ -21,10 +21,10 @@
 import bitnagil.bitnagil_backend.recommendedRoutine.service.RecommendedRoutineManager;
 import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
 import bitnagil.bitnagil_backend.routineInfoV2.repository.RoutineInfoV2Repository;
-import bitnagil.bitnagil_backend.routineInfoV2.service.RoutineInfoFactoryV2;
+import bitnagil.bitnagil_backend.routineInfoV2.service.RoutineInfoV2Factory;
 import bitnagil.bitnagil_backend.routineV2.domain.RoutineV2;
 import bitnagil.bitnagil_backend.routineV2.repository.RoutineV2Repository;
-import bitnagil.bitnagil_backend.routineV2.service.RoutineFactoryV2;
+import bitnagil.bitnagil_backend.routineV2.service.RoutineV2Factory;
 import bitnagil.bitnagil_backend.user.domain.User;
 import bitnagil.bitnagil_backend.user.service.UserManager;
 import lombok.RequiredArgsConstructor;
@@ -57,8 +57,8 @@ public class OnboardingService {
     private final RoutineInfoV2Repository routineInfoV2Repository;
     private final RoutineV2Repository routineV2Repository;
 
-    private final RoutineFactoryV2 routineFactoryV2;
-    private final RoutineInfoFactoryV2 routineInfoFactory;
+    private final RoutineV2Factory routineV2Factory;
+    private final RoutineInfoV2Factory routineInfoV2Factory;
 
 
     /**
@@ -108,7 +108,7 @@ public void registrationRoutinesV2(RegistrationRoutinesRequest request, User use
                     .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE));
 
             // 온보딩으로 등록한 루틴은 루틴 시작, 종료일자가 당일로 설정된다.
-            RoutineInfoV2 routineInfo = routineInfoFactory.createNewRoutineInfo(
+            RoutineInfoV2 routineInfo = routineInfoV2Factory.createNewRoutineInfo(
                     recommendedRoutine.getRecommendedRoutineName(),
                     List.of(), // 온보딩은 반복일자를 설정하지 않는다.
                     recommendedRoutine.getExecutionTime(),
@@ -130,16 +130,17 @@ public void registrationRoutinesV2(RegistrationRoutinesRequest request, User use
 
             // 서브 루틴 완료 여부 리스트 생성
             List<Boolean> subRoutineCompleteYn = recommendedSubRoutines.stream()
-                    .map(completeYn -> false)
-                    .toList();
+                .map(completeYn -> false)
+                .toList();
 
             // 루틴 정보에 해당하는 루틴을 생성한다.
-            RoutineV2 routine = routineFactoryV2.createNewRoutine(
+            RoutineV2 routine = routineV2Factory.createNewRoutine(
                     today,
                     false,
                     subRoutineNames,
                     subRoutineCompleteYn,
                     routineInfo);
+
             routineV2Repository.save(routine);
         }
     }
diff --git a/src/main/java/bitnagil/bitnagil_backend/routine/request/RegisterRoutineRequest.java b/src/main/java/bitnagil/bitnagil_backend/routine/request/RegisterRoutineRequest.java
@@ -23,6 +23,7 @@ public class RegisterRoutineRequest {
     @Schema(description = "반복 요일에 대한 리스트입니다.",
             example = "[\"MONDAY\", \"FRIDAY\"]",
             required = true)
+    @NotNull
     private List<DayOfWeek> repeatDay;
 
     @Schema(description = "루틴 시작 시간입니다.",
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineInfoV2/domain/RoutineInfoV2.java b/src/main/java/bitnagil/bitnagil_backend/routineInfoV2/domain/RoutineInfoV2.java
@@ -5,6 +5,7 @@
 import java.time.LocalTime;
 import java.util.List;
 
+import bitnagil.bitnagil_backend.global.entity.BaseTimeEntity;
 import bitnagil.bitnagil_backend.global.utils.DayOfWeekConverter;
 import bitnagil.bitnagil_backend.user.domain.User;
 import jakarta.persistence.Convert;
@@ -31,7 +32,7 @@
 @Entity
 @SQLDelete(sql = "UPDATE routine_info_v2 SET deleted_at = NOW() WHERE routine_info_id = ?")
 @Where(clause = "deleted_at IS NULL")
-public class RoutineInfoV2 {
+public class RoutineInfoV2 extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long routineInfoId; // 루틴 정보 ID
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineInfoV2/service/RoutineInfoV2Factory.java b/src/main/java/bitnagil/bitnagil_backend/routineInfoV2/service/RoutineInfoV2Factory.java
@@ -13,7 +13,7 @@
  * 루틴 관련 엔티티 생성, 초기화 책임을 담당하는 클래스입니다.
  */
 @Component
-public class RoutineInfoFactoryV2 {
+public class RoutineInfoV2Factory {
 
     // 신규 RoutineInfo 엔티티 생성 및 초기화
     public RoutineInfoV2 createNewRoutineInfo(String routineName, List<DayOfWeek> routineRepeatDay,
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineV2/controller/RoutineV2Controller.java b/src/main/java/bitnagil/bitnagil_backend/routineV2/controller/RoutineV2Controller.java
@@ -0,0 +1,29 @@
+package bitnagil.bitnagil_backend.routineV2.controller;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import bitnagil.bitnagil_backend.global.annotation.CurrentUser;
+import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
+import bitnagil.bitnagil_backend.routineV2.controller.spec.RoutineV2Spec;
+import bitnagil.bitnagil_backend.routineV2.request.RegisterRoutineV2Request;
+import bitnagil.bitnagil_backend.routineV2.service.RoutineV2Service;
+import bitnagil.bitnagil_backend.user.domain.User;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/api/v2/routines")
+public class RoutineV2Controller implements RoutineV2Spec {
+
+    private final RoutineV2Service routineV2Service;
+
+    @PostMapping("")
+    public CustomResponseDto<Object> registerRoutine(@CurrentUser User user, @RequestBody RegisterRoutineV2Request request) {
+        routineV2Service.registerRoutineV2(user, request);
+
+        return CustomResponseDto.from(null);
+    }
+}
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineV2/controller/spec/RoutineV2Spec.java b/src/main/java/bitnagil/bitnagil_backend/routineV2/controller/spec/RoutineV2Spec.java
@@ -0,0 +1,15 @@
+package bitnagil.bitnagil_backend.routineV2.controller.spec;
+
+import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
+import bitnagil.bitnagil_backend.global.swagger.ApiTags;
+import bitnagil.bitnagil_backend.routineV2.request.RegisterRoutineV2Request;
+import bitnagil.bitnagil_backend.user.domain.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@Tag(name = ApiTags.ROUTINEV2)
+public interface RoutineV2Spec {
+
+    @Operation(summary = "루틴 정보 등록 및 루틴 시작, 종료일자 사이에서 반복요일에 해당하는 날짜로 루틴 데이터를 생성합니다.")
+    CustomResponseDto<Object> registerRoutine(User user, RegisterRoutineV2Request request);
+}
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineV2/domain/RoutineV2.java b/src/main/java/bitnagil/bitnagil_backend/routineV2/domain/RoutineV2.java
@@ -3,6 +3,7 @@
 import java.time.LocalDate;
 import java.util.List;
 
+import bitnagil.bitnagil_backend.global.entity.BaseTimeEntity;
 import bitnagil.bitnagil_backend.global.utils.BooleanListConverter;
 import bitnagil.bitnagil_backend.global.utils.StringListConverter;
 import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
@@ -30,7 +31,7 @@
 @Entity
 @SQLDelete(sql = "UPDATE routine_v2 SET deleted_at = NOW() WHERE routine_id = ?")
 @Where(clause = "deleted_at IS NULL")
-public class RoutineV2 {
+public class RoutineV2 extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long routineId; // 일일 루틴 ID
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineV2/request/RegisterRoutineV2Request.java b/src/main/java/bitnagil/bitnagil_backend/routineV2/request/RegisterRoutineV2Request.java
@@ -0,0 +1,51 @@
+package bitnagil.bitnagil_backend.routineV2.request;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@Schema(description = "루틴 등록 요청 DTO")
+public class RegisterRoutineV2Request {
+
+    @Schema(description = "루틴 이름입니다.",
+            example = "아침 준비",
+            required = true)
+    @NotNull
+    private String routineName;
+
+    @Schema(description = "반복 요일에 대한 리스트입니다. (반복요일이 없으면 당일 루틴입니다.)",
+            example = "[\"MONDAY\", \"FRIDAY\"]",
+            required = true)
+    @NotNull
+    private List<DayOfWeek> repeatDay;
+
+    @Schema(description = "루틴 시작 일자입니다.",
+            example = "2025-08-01",
+            required = true)
+    @NotNull
+    private LocalDate routineStartDate;
+
+    @Schema(description = "루틴 시작 일자입니다.",
+            example = "2025-08-31",
+            required = true)
+    @NotNull
+    private LocalDate routineEndDate;
+
+    @Schema(description = "루틴 시작 시간입니다.",
+        example = "08:15:00",
+        required = true)
+    @NotNull
+    private LocalTime executionTime;
+
+    @Schema(description = "세부 루틴 이름에 대한 리스트입니다.",
+        example = "[\"손 씻기\", \"세수 하기\", \"양치 하기\"]")
+    private List<String> subRoutineName;
+}
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineV2/service/RoutineV2Factory.java b/src/main/java/bitnagil/bitnagil_backend/routineV2/service/RoutineV2Factory.java
@@ -2,6 +2,7 @@
 
 import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
 import bitnagil.bitnagil_backend.routineV2.domain.RoutineV2;
+
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
@@ -11,7 +12,7 @@
  * 루틴 관련 엔티티 생성, 초기화 책임을 담당하는 클래스입니다.
  */
 @Component
-public class RoutineFactoryV2 {
+public class RoutineV2Factory {
 
     // 신규 Routine 엔티티 생성 및 초기화
     public RoutineV2 createNewRoutine(LocalDate routineDate, Boolean routineCompleteYn, List<String> subRoutineNames,
diff --git a/src/main/java/bitnagil/bitnagil_backend/routineV2/service/RoutineV2Service.java b/src/main/java/bitnagil/bitnagil_backend/routineV2/service/RoutineV2Service.java
@@ -0,0 +1,96 @@
+package bitnagil.bitnagil_backend.routineV2.service;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
+import bitnagil.bitnagil_backend.routineInfoV2.repository.RoutineInfoV2Repository;
+import bitnagil.bitnagil_backend.routineInfoV2.service.RoutineInfoV2Factory;
+import bitnagil.bitnagil_backend.routineV2.domain.RoutineV2;
+import bitnagil.bitnagil_backend.routineV2.repository.RoutineV2Repository;
+import bitnagil.bitnagil_backend.routineV2.request.RegisterRoutineV2Request;
+import bitnagil.bitnagil_backend.user.domain.User;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * [v2] 루틴 관련된 서비스 로직을 담은 클래스입니다.
+ */
+@Service
+@RequiredArgsConstructor
+public class RoutineV2Service {
+
+    private final RoutineInfoV2Repository routineInfoV2Repository;
+    private final RoutineInfoV2Factory routineInfoV2Factory;
+    private final RoutineV2Factory routineV2Factory;
+    private final RoutineV2Repository routineV2Repository;
+
+    /**
+     * 루틴 정보를 등록하면서 루틴 시작, 종료일자를 기반으로 루틴 내역을 생성
+     */
+    @Transactional
+    public void registerRoutineV2(User user, RegisterRoutineV2Request request) {
+
+        LocalDate today = LocalDate.now();
+
+        // repeatDay가 비어 있으면 빈 리스트, 아니면 요청값 사용
+        List<DayOfWeek> repeatDays = request.getRepeatDay().isEmpty() ? List.of() : request.getRepeatDay();
+
+        // 루틴 정보 등록
+        RoutineInfoV2 routineInfo = routineInfoV2Factory.createNewRoutineInfo(
+            request.getRoutineName(),
+            repeatDays,
+            request.getExecutionTime(),
+            request.getRoutineStartDate(),
+            request.getRoutineEndDate(),
+            user);
+
+        routineInfoV2Repository.save(routineInfo);
+
+        // 루틴을 생성할 날짜 목록 생성
+        List<LocalDate> targetDates = request.getRepeatDay().isEmpty()
+            ? List.of(today) // 당일 루틴
+            : generateRoutineDatesWithinPeriod(
+                request.getRoutineStartDate(),
+                request.getRoutineEndDate(),
+                request.getRepeatDay());
+
+        // 서브 루틴 완료 여부 리스트 생성
+        List<Boolean> subRoutineCompleteYn = request.getSubRoutineName().stream()
+            .map(completeYn -> false)
+            .toList();
+
+        // 위 날짜 목록을 바탕으로 루틴 생성
+        List<RoutineV2> routinesToRegister = targetDates.stream()
+            .map(routineDate -> routineV2Factory.createNewRoutine(
+                routineDate,
+                false,
+                request.getSubRoutineName(),
+                subRoutineCompleteYn,
+                routineInfo
+            ))
+            .toList();
+
+        routineV2Repository.saveAll(routinesToRegister);
+    }
+
+    /**
+     * 날짜 범위에서 주어진 요일(repeatDays)에 해당하는 날짜만 반환
+     */
+    private List<LocalDate> generateRoutineDatesWithinPeriod(
+        LocalDate startDate, LocalDate endDate, List<DayOfWeek> repeatDays) {
+
+        List<LocalDate> routineDatesToRegister = new ArrayList<>();
+        for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) {
+            if (repeatDays.contains(date.getDayOfWeek())) {
+                routineDatesToRegister.add(date);
+            }
+        }
+        return routineDatesToRegister;
+    }
+
+}
