[T3-152] 온보딩 등록 V2 API 및 유저 Role 추가 (#57)

* feat: ONBOARDING User Role 추가

* feat: 온보딩 등록 V2 API

* refactor: 스트림 변수명 수정

Author: thisishwan2

src/main/java/bitnagil/bitnagil_backend/enums/Role.java

@@ -7,7 +7,8 @@ public enum Role implements EnumType {
 
     GUEST("ROLE_GUEST"),
     USER("ROLE_USER"),
-    WITHDRAWN("ROLE_WITHDRAWN");
+    WITHDRAWN("ROLE_WITHDRAWN"),
+    ONBOARDING("ROLE_ONBOARDING"),;
 
     private final String description;
 

src/main/java/bitnagil/bitnagil_backend/global/config/SecurityConfig.java

@@ -62,6 +62,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
                 // GUEST 권한으로만 접근 가능한 경로
                 .requestMatchers("/api/v1/auth/agreements").hasRole("GUEST")
+                // ONBAORDING 권한으로만 접근 가능한 경로
+                .requestMatchers("/api/v1/onboardings").hasRole("ONBOARDING")
                 // USER 권한으로만 접근 가능한 경로(전체)
                 .requestMatchers("/**").hasRole("USER")
                 .anyRequest().authenticated()

src/main/java/bitnagil/bitnagil_backend/onboarding/controller/OnboardingController.java

@@ -16,18 +16,28 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(value = "/api/v1/onboardings")
+@RequestMapping(value = "/api")
 public class OnboardingController implements OnboardingSpec {
 
     private final OnboardingService onboardingService;
 
-    @PostMapping()
+    @PostMapping("/v1/onboardings")
     public CustomResponseDto<OnboardingResponse> startOnboarding(@RequestBody OnboardingRequest onboardingRequest,
                                                                 @CurrentUser User user) {
         return onboardingService.startOnboarding(onboardingRequest, user);
     }
 
-    @PostMapping("/routines")
+    // 온보딩 루틴 등록 API (V2)
+    @PostMapping("/v2/onboardings/routines")
+    public CustomResponseDto<Object> registrationRoutinesV2(@RequestBody RegistrationRoutinesRequest registrationRoutinesRequest,
+                                                            @CurrentUser User user) {
+        onboardingService.registrationRoutinesV2(registrationRoutinesRequest, user);
+        return CustomResponseDto.from(null);
+    }
+
+    // TODO: v2로 전환 시 deprecated 처리
+    @Deprecated()
+    @PostMapping("/v1/onboardings/routines")
     public CustomResponseDto<Object> registrationRoutines(@RequestBody RegistrationRoutinesRequest registrationRoutinesRequest,
                                                         @CurrentUser User user) {
         onboardingService.registrationRoutines(registrationRoutinesRequest, user);

src/main/java/bitnagil/bitnagil_backend/onboarding/controller/spec/OnboardingSpec.java

@@ -21,6 +21,13 @@ public interface OnboardingSpec {
     })
     public CustomResponseDto<OnboardingResponse> startOnboarding(OnboardingRequest onboardingRequest, User user);
 
+    @Operation(summary = "(V2) 온보딩 시 추천 루틴을 등록합니다.(복수 선택이 가능합니다.)")
+    @ApiErrorCodeExamples({
+            ErrorCode.NOT_FOUND_USER, ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE
+    })
+    public CustomResponseDto<Object> registrationRoutinesV2(RegistrationRoutinesRequest registrationRoutinesRequest,
+                                                        User user);
+
     @Operation(summary = "온보딩 시 추천 루틴을 등록합니다.(복수 선택이 가능합니다.)")
     @ApiErrorCodeExamples({
             ErrorCode.NOT_FOUND_USER, ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE

src/main/java/bitnagil/bitnagil_backend/onboarding/service/OnboardingService.java

@@ -19,8 +19,13 @@
 import bitnagil.bitnagil_backend.recommendedRoutine.repository.RecommendedRoutineRepository;
 import bitnagil.bitnagil_backend.recommendedRoutine.repository.RecommendedSubRoutineRepository;
 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.routineV2.domain.RoutineV2;
+import bitnagil.bitnagil_backend.routineV2.repository.RoutineV2Repository;
+import bitnagil.bitnagil_backend.routineV2.service.RoutineFactoryV2;
 import bitnagil.bitnagil_backend.user.domain.User;
-import bitnagil.bitnagil_backend.user.repository.UserRepository;
 import bitnagil.bitnagil_backend.user.service.UserManager;
 import lombok.RequiredArgsConstructor;
 
@@ -38,17 +43,24 @@
 public class OnboardingService {
 
     private final OnboardingRepository onboardingRepository;
-    private final UserRepository userRepository;
     private final RecommendedRoutineRepository recommendRoutineRepository;
     private final RecommendedSubRoutineRepository recommendedSubRoutineRepository;
     private final ChangedRoutineRepository changedRoutineRepository;
     private final ChangedSubRoutineRepository changedSubRoutineRepository;
 
-
     private final RecommendedRoutineManager recommendedRoutineManager;
     private final ChangedRoutineFactory changedRoutineFactory;
     private final UserManager userManager;
 
+    // V2 관련 리포지토리
+    // TODO: v2로 전환 시 Rename
+    private final RoutineInfoV2Repository routineInfoV2Repository;
+    private final RoutineV2Repository routineV2Repository;
+
+    private final RoutineFactoryV2 routineFactoryV2;
+    private final RoutineInfoFactoryV2 routineInfoFactory;
+
+
     /**
      * 유저와 매칭되는 온보딩 결과를 설정하고, 리턴하는 메서드
      */
@@ -86,6 +98,58 @@ public CustomResponseDto<OnboardingResponse> startOnboarding(OnboardingRequest r
      * 온보딩 시 추천 루틴을 저장하는 메서드
      */
     @Transactional
+    public void registrationRoutinesV2(RegistrationRoutinesRequest request, User user) {
+
+        LocalDate today = LocalDate.now();
+
+        for (Long recommendedRoutineId : request.getRecommendedRoutineIds()) {
+            // 추천 루틴을 조회한다
+            RecommendedRoutine recommendedRoutine = recommendRoutineRepository.findById(recommendedRoutineId)
+                    .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE));
+
+            // 온보딩으로 등록한 루틴은 루틴 시작, 종료일자가 당일로 설정된다.
+            RoutineInfoV2 routineInfo = routineInfoFactory.createNewRoutineInfo(
+                    recommendedRoutine.getRecommendedRoutineName(),
+                    List.of(), // 온보딩은 반복일자를 설정하지 않는다.
+                    recommendedRoutine.getExecutionTime(),
+                    today,
+                    today,
+                    user
+            );
+
+            routineInfoV2Repository.save(routineInfo);
+
+            // 추천 서브 루틴을 조회한다.
+            List<RecommendedSubRoutine> recommendedSubRoutines =
+                    recommendedSubRoutineRepository.findByRecommendedRoutine(recommendedRoutine);
+
+            // 서브 루틴 이름 리스트 생성
+            List<String> subRoutineNames = recommendedSubRoutines.stream()
+                    .map(RecommendedSubRoutine::getSubRoutineName)
+                    .toList();
+
+            // 서브 루틴 완료 여부 리스트 생성
+            List<Boolean> subRoutineCompleteYn = recommendedSubRoutines.stream()
+                    .map(completeYn -> false)
+                    .toList();
+
+            // 루틴 정보에 해당하는 루틴을 생성한다.
+            RoutineV2 routine = routineFactoryV2.createNewRoutine(
+                    today,
+                    false,
+                    subRoutineNames,
+                    subRoutineCompleteYn,
+                    routineInfo);
+            routineV2Repository.save(routine);
+        }
+    }
+
+    /**
+     * 온보딩 시 추천 루틴을 저장하는 메서드
+     */
+    // TODO: v2로 전환 시 deprecated 처리
+    @Deprecated
+    @Transactional
     public void registrationRoutines(RegistrationRoutinesRequest request, User user) {
 
         LocalDate today = LocalDate.now();

src/main/java/bitnagil/bitnagil_backend/routineInfoV2/repository/RoutineInfoV2Repository.java

@@ -0,0 +1,10 @@
+package bitnagil.bitnagil_backend.routineInfoV2.repository;
+
+import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface RoutineInfoV2Repository extends JpaRepository<RoutineInfoV2, Long> {
+
+}

src/main/java/bitnagil/bitnagil_backend/routineInfoV2/service/RoutineInfoFactoryV2.java

@@ -0,0 +1,31 @@
+package bitnagil.bitnagil_backend.routineInfoV2.service;
+
+import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
+import bitnagil.bitnagil_backend.user.domain.User;
+import org.springframework.stereotype.Component;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+/**
+ * 루틴 관련 엔티티 생성, 초기화 책임을 담당하는 클래스입니다.
+ */
+@Component
+public class RoutineInfoFactoryV2 {
+
+    // 신규 RoutineInfo 엔티티 생성 및 초기화
+    public RoutineInfoV2 createNewRoutineInfo(String routineName, List<DayOfWeek> routineRepeatDay,
+                                        LocalTime routineExecutionTime, LocalDate routineStartDate,
+                                        LocalDate routineEndDate, User user) {
+        return RoutineInfoV2.builder()
+                .routineName(routineName)
+                .routineRepeatDay(routineRepeatDay) // 온보딩은 반복일자를 설정하지 않는다.
+                .routineExecutionTime(routineExecutionTime)
+                .routineStartDate(routineStartDate)
+                .routineEndDate(routineEndDate)
+                .user(user)
+                .build();
+    }
+}

src/main/java/bitnagil/bitnagil_backend/routineV2/repository/RoutineV2Repository.java

@@ -0,0 +1,10 @@
+package bitnagil.bitnagil_backend.routineV2.repository;
+
+import bitnagil.bitnagil_backend.routineV2.domain.RoutineV2;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface RoutineV2Repository extends JpaRepository<RoutineV2, Long> {
+
+}

src/main/java/bitnagil/bitnagil_backend/routineV2/service/RoutineFactoryV2.java

@@ -0,0 +1,27 @@
+package bitnagil.bitnagil_backend.routineV2.service;
+
+import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
+import bitnagil.bitnagil_backend.routineV2.domain.RoutineV2;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 루틴 관련 엔티티 생성, 초기화 책임을 담당하는 클래스입니다.
+ */
+@Component
+public class RoutineFactoryV2 {
+
+    // 신규 Routine 엔티티 생성 및 초기화
+    public RoutineV2 createNewRoutine(LocalDate routineDate, Boolean routineCompleteYn, List<String> subRoutineNames,
+                                      List<Boolean> subRoutineCompleteYn, RoutineInfoV2 routineInfo) {
+        return RoutineV2.builder()
+                .routineDate(routineDate)
+                .routineCompleteYn(routineCompleteYn)
+                .subRoutineNames(subRoutineNames)
+                .subRoutineCompleteYn(subRoutineCompleteYn)
+                .routineInfo(routineInfo)
+                .build();
+    }
+}

src/main/java/bitnagil/bitnagil_backend/user/domain/User.java

@@ -68,11 +68,12 @@ public void updateAgreements(Boolean agreedToTermsOfService, Boolean agreedToPri
         this.agreedToTermsOfService = agreedToTermsOfService;
         this.agreedToPrivacyPolicy = agreedToPrivacyPolicy;
         this.isOverFourteen = isOverFourteen;
-        this.role = Role.USER; // 약관 동의 후 권한을 USER로 변경
+        this.role = Role.ONBOARDING; // 약관 동의 후 권한을 임시 USER인 ONBOARDING으로 변경
     }
 
     public void updateOnboarding(Onboarding onboarding) {
         this.onboarding = onboarding;
+        this.role = Role.USER; // 온보딩 완료 후 권한을 USER로 변경
     }
 
     // todo: 운영 반영 후 이슈가 없으면 제거