[T3-120] 추천 루틴 단건 조회 API (#36)

* fix: 추천 루틴 엔티티 실행시간 변수명 수정

* fix: 추천 루틴 엔티티 실행시간 변수명 수정에 따른 sql 수정

* feat: 추천 루틴 단건 조회 API

* chore: 서브모듈 업데이트

* remove: 불필요한 dto 제거

* fix: swagger 명세 수정

* fix: 추천 루틴 단건조회 로직 수정

* fix: 추천루틴 엔티티 필드명 변경에 따른 수정(time -> executionTime)

Author: thisishwan2

config

@@ -25,7 +25,7 @@ public ChangedRoutine createChangedRoutineForOnboarding(
         return ChangedRoutine.builder()
             .changedRoutinePk(new HistoryPk(UUID.randomUUID(), 1L))
             .changedRoutineName(recommendedRoutine.getRecommendedRoutineName())
-            .changedExecutionTime(recommendedRoutine.getTime())
+            .changedExecutionTime(recommendedRoutine.getExecutionTime())
             .originalRoutineDate(today) // 원본 루틴 날짜는 현재 날짜로 설정
             .changedRoutineDate(today) // 변경된 루틴 날짜도 현재 날짜로 설정
             .historyStartDateTime(now)

src/main/java/bitnagil/bitnagil_backend/changedRoutine/service/ChangedRoutineFactory.java

@@ -4,10 +4,12 @@
 import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
 import bitnagil.bitnagil_backend.recommendedRoutine.controller.spec.RecommendedRoutineSpec;
 import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineSearchResponse;
+import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineSearchResult;
 import bitnagil.bitnagil_backend.recommendedRoutine.service.RecommendedRoutineService;
 import bitnagil.bitnagil_backend.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,8 +19,15 @@
 public class RecommendedRoutineController implements RecommendedRoutineSpec {
     private final RecommendedRoutineService recommendedRoutineService;
 
+    // 추천 루틴 전체 조회
     @GetMapping("")
     public CustomResponseDto<RecommendedRoutineSearchResponse> searchRecommendedRoutines(@CurrentUser User user) {
         return CustomResponseDto.from(recommendedRoutineService.searchRecommendedRoutines(user));
     }
+
+    // 추천 루틴 단건 조회
+    @GetMapping("/{recommendedRoutineId}")
+    public CustomResponseDto<RecommendedRoutineSearchResult> searchRecommendedRoutine(@PathVariable Long recommendedRoutineId) {
+        return CustomResponseDto.from(recommendedRoutineService.searchRecommendedRoutine(recommendedRoutineId));
+    }
 }

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/controller/RecommendedRoutineController.java

@@ -5,8 +5,11 @@
 import bitnagil.bitnagil_backend.global.swagger.ApiErrorCodeExamples;
 import bitnagil.bitnagil_backend.global.swagger.ApiTags;
 import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineSearchResponse;
+import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineSearchResult;
 import bitnagil.bitnagil_backend.user.domain.User;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 @Tag(name = ApiTags.RECOMMENDED_ROUTINE)
@@ -18,4 +21,12 @@ public interface RecommendedRoutineSpec {
     })
     CustomResponseDto<RecommendedRoutineSearchResponse> searchRecommendedRoutines(User user);
 
+    @Operation(summary = "추천 루틴 단건을 조회합니다.")
+    @ApiErrorCodeExamples({
+            ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE
+    })
+    @Parameters({
+            @Parameter(name = "recommendedRoutineId", description = "추천 루틴 ID", required = true, example = "1")
+    })
+    public CustomResponseDto<RecommendedRoutineSearchResult> searchRecommendedRoutine(Long recommendedRoutineId);
 }

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/controller/spec/RecommendedRoutineSpec.java

@@ -27,7 +27,7 @@ public class RecommendedRoutine extends BaseTimeEntity {
     @Column(columnDefinition = "varchar(40)")
     private RecommendedRoutineType recommendedRoutineType; // 추천 루틴 타입 (분류에 해당)
 
-    private LocalTime time; // 시간
+    private LocalTime executionTime; // 추천 루틴 실행시간
 
     /**
      * 추천 루틴의 반복 요일은 코드레벨에서 설정한다.

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/domain/RecommendedRoutine.java

@@ -1,24 +1,33 @@
 package bitnagil.bitnagil_backend.recommendedRoutine.response;
 
 import bitnagil.bitnagil_backend.recommendedRoutine.domain.enums.RecommendedRoutineLevel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
+import java.time.LocalTime;
 import java.util.List;
 
 @Getter
 @AllArgsConstructor
 @Builder
 public class RecommendedRoutineSearchResult {
     // 추천 루틴 ID
+    @Schema(description = "추천 루틴 ID", example = "1")
     private Long recommendedRoutineId;
     // 추천 루틴 이름
+    @Schema(description = "추천 루틴 이름", example = "물마시기")
     private String recommendedRoutineName;
     // 추천 루틴 설명
+    @Schema(description = "추천 루틴 설명", example = "하루에 물을 많이 마셔보아요")
     private String recommendedRoutineDescription;
     // 추천 루틴 난이도
+    @Schema(description = "추천 루틴 난이도", example = "LEVEL1")
     private RecommendedRoutineLevel recommendedRoutineLevel;
+    // 추천 루틴 수행 시간
+    @Schema(description = "추천 루틴 수행 시간", example = "08:00:00")
+    private LocalTime executionTime; // HH:mm 형식으로 변환된 수행 시간
     // 추천 서브 루틴 리스트
     private List<RecommendedSubRoutineSearchResult> recommendedSubRoutineSearchResult;
 }

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/response/RecommendedRoutineSearchResult.java

@@ -1,5 +1,6 @@
 package bitnagil.bitnagil_backend.recommendedRoutine.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -11,6 +12,8 @@
 @AllArgsConstructor
 @Builder
 public class RecommendedSubRoutineSearchResult {
+    @Schema(description = "추천 서브 루틴 ID", example = "1")
     private Long recommendedSubRoutineId; // 추천 서브 루틴 ID
+    @Schema(description = "추천 서브 루틴 이름", example = "물 2L 마시기")
     private String recommendedSubRoutineName; // 추천 서브 루틴 이름
 }

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/response/RecommendedSubRoutineSearchResult.java

@@ -37,6 +37,7 @@ public RecommendedRoutineSearchResult toRecommendedRoutineSearchResult(
             .recommendedRoutineName(recommendedRoutine.getRecommendedRoutineName())
             .recommendedRoutineDescription(recommendedRoutine.getRecommendedRoutineDescription())
             .recommendedRoutineLevel(recommendedRoutine.getRecommendedRoutineLevel())
+            .executionTime(recommendedRoutine.getExecutionTime())
             .recommendedSubRoutineSearchResult(recommendedSubRoutineResults)
             .build();
     }

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/service/RecommendedRoutineMapper.java

@@ -56,7 +56,6 @@ public RecommendedRoutineSearchResponse searchRecommendedRoutines(User user) {
         response.put(RecommendedRoutineType.PERSONALIZED, new ArrayList<>()); // 맞춤 루틴은 미리 초기화 한다.(감정구슬, 온보딩 결과를 넣기 위해)
 
         // 영속성 객체에 user를 저장하기 위해 user를 조회
-        
         user = userRepository.findByUserPk(user.getUserPk())
             .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
 
@@ -72,6 +71,25 @@ public RecommendedRoutineSearchResponse searchRecommendedRoutines(User user) {
                 .build();
     }
 
+    /**
+     * 추천 루틴 단건 조회
+     */
+    @Transactional(readOnly = true)
+    public RecommendedRoutineSearchResult searchRecommendedRoutine(Long recommendedRoutineId) {
+        RecommendedRoutine recommendedRoutine = recommendedRoutineRepository.findById(recommendedRoutineId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE));
+
+        List<RecommendedSubRoutineSearchResult> recommendedSubRoutineSearchResults = new ArrayList<>();
+        // 추천 루틴에 해당하는 서브루틴 조회
+        List<RecommendedSubRoutine> recommendedSubRoutines = recommendedSubRoutineRepository.findByRecommendedRoutine(recommendedRoutine);
+        for (RecommendedSubRoutine recommendedSubRoutine : recommendedSubRoutines) {
+            RecommendedSubRoutineSearchResult recommendedSubRoutineSearchResult = recommendedRoutineMapper.toRecommendedSubRoutineSearchResult(recommendedSubRoutine);
+            recommendedSubRoutineSearchResults.add(recommendedSubRoutineSearchResult);
+        }
+
+        return recommendedRoutineMapper.toRecommendedRoutineSearchResult(recommendedRoutine, recommendedSubRoutineSearchResults);
+    }
+
     private void addCategoryRecommendedRoutines(Map<RecommendedRoutineType, List<RecommendedRoutineSearchResult>> response) {
         RecommendedRoutineType[] values = RecommendedRoutineType.values();
 

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/service/RecommendedRoutineService.java

@@ -757,7 +757,7 @@ VALUES
 
 
 -- recommended routine
-INSERT INTO recommended_routine (recommended_routine_type, time, recommended_routine_name, recommended_routine_description, recommended_routine_level, emotion, case_id, thumbnail_url, created_at, updated_at, deleted_at)
+INSERT INTO recommended_routine (recommended_routine_type, execution_time, recommended_routine_name, recommended_routine_description, recommended_routine_level, emotion, case_id, thumbnail_url, created_at, updated_at, deleted_at)
 VALUES
     ('OUTING', '20:00:00', '저녁 산책하기', '하루를 정리하며 차분한 시간을 가질 수 있어요.', 'LEVEL3', 'VITALITY', 10, NULL, NOW(), NOW(), NULL),
     ('REST', '08:00:00', '기지개 펴기', '굳은 몸을 풀어주면 기분 전환이 돼요.', ' LEVEL1', 'FATIGUE', 1, NULL, NOW(), NOW(), NULL),