Skip to content

Commit 9e8f359

Browse files
authored
[T3-166] 추천루틴 조회 응답값에 추천 루틴 타입 추가 및 루틴 등록시 요청값에 추천 루틴 추가 (#64)
* feat: 감정 구술 추천 루틴, 온보딩 추천 루틴 저장 시 추천 루틴 타입 추가 * feat: RecommendedRoutineSearchResult에 추천루틴타입 응답 추가 * feat: 추천 루틴 타입 추가 * feat: 루틴 등록 시 추천 루틴 타입 추가
1 parent fc26b26 commit 9e8f359

6 files changed

Lines changed: 14 additions & 1 deletion

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public void registrationRoutinesV2(RegistrationRoutinesRequest request, User use
114114
recommendedRoutine.getExecutionTime(),
115115
today,
116116
today,
117+
recommendedRoutine.getRecommendedRoutineType(),
117118
user
118119
);
119120

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package bitnagil.bitnagil_backend.recommendedRoutine.response;
22

33
import bitnagil.bitnagil_backend.recommendedRoutine.domain.enums.RecommendedRoutineLevel;
4+
import bitnagil.bitnagil_backend.recommendedRoutine.domain.enums.RecommendedRoutineType;
45
import io.swagger.v3.oas.annotations.media.Schema;
56
import lombok.AllArgsConstructor;
67
import lombok.Builder;
@@ -28,6 +29,8 @@ public class RecommendedRoutineSearchResult {
2829
// 추천 루틴 수행 시간
2930
@Schema(description = "추천 루틴 수행 시간", example = "08:00:00")
3031
private LocalTime executionTime; // HH:mm 형식으로 변환된 수행 시간
32+
@Schema(description = "추천 루틴 타입", example = "WAKE_UP")
33+
private RecommendedRoutineType recommendedRoutineType;
3134
// 추천 서브 루틴 리스트
3235
private List<RecommendedSubRoutineSearchResult> recommendedSubRoutineSearchResult;
3336
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public RecommendedRoutineSearchResult toRecommendedRoutineSearchResult(
4343
.recommendedRoutineLevel(recommendedRoutine.getRecommendedRoutineLevel())
4444
.executionTime(recommendedRoutine.getExecutionTime())
4545
.recommendedSubRoutineSearchResult(recommendedSubRoutineResults)
46+
.recommendedRoutineType(recommendedRoutine.getRecommendedRoutineType())
4647
.build();
4748
}
4849

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package bitnagil.bitnagil_backend.routineInfoV2.service;
22

3+
import bitnagil.bitnagil_backend.recommendedRoutine.domain.enums.RecommendedRoutineType;
34
import bitnagil.bitnagil_backend.routineInfoV2.domain.RoutineInfoV2;
45
import bitnagil.bitnagil_backend.user.domain.User;
56
import org.springframework.stereotype.Component;
@@ -18,7 +19,8 @@ public class RoutineInfoV2Factory {
1819
// 신규 RoutineInfo 엔티티 생성 및 초기화
1920
public RoutineInfoV2 createNewRoutineInfo(String routineName, List<DayOfWeek> routineRepeatDay,
2021
LocalTime routineExecutionTime, LocalDate routineStartDate,
21-
LocalDate routineEndDate, User user) {
22+
LocalDate routineEndDate, RecommendedRoutineType recommendedRoutineType,
23+
User user) {
2224
return RoutineInfoV2.builder()
2325
.routineName(routineName)
2426
.routineRepeatDay(routineRepeatDay) // 온보딩은 반복일자를 설정하지 않는다.
@@ -27,6 +29,7 @@ public RoutineInfoV2 createNewRoutineInfo(String routineName, List<DayOfWeek> ro
2729
.routineEndDate(routineEndDate)
2830
.routineDeletedYn(false)
2931
.user(user)
32+
.recommendedRoutineType(recommendedRoutineType)
3033
.build();
3134
}
3235
}

src/main/java/bitnagil/bitnagil_backend/routineV2/request/RegisterRoutineV2Request.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.time.LocalTime;
66
import java.util.List;
77

8+
import bitnagil.bitnagil_backend.recommendedRoutine.domain.enums.RecommendedRoutineType;
89
import io.swagger.v3.oas.annotations.media.Schema;
910
import jakarta.validation.constraints.NotNull;
1011
import lombok.Getter;
@@ -48,4 +49,7 @@ public class RegisterRoutineV2Request {
4849
@Schema(description = "세부 루틴 이름에 대한 리스트입니다.",
4950
example = "[\"손 씻기\", \"세수 하기\", \"양치 하기\"]")
5051
private List<String> subRoutineName;
52+
53+
@Schema(description = "추천 루틴 타입입니다.", example = "WAKE_UP")
54+
private RecommendedRoutineType recommendedRoutineType;
5155
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public void registerRoutineV2(User user, RegisterRoutineV2Request request) {
7272
request.getExecutionTime(),
7373
request.getRoutineStartDate(),
7474
request.getRoutineEndDate(),
75+
request.getRecommendedRoutineType(),
7576
user);
7677

7778
routineInfoV2Repository.save(routineInfo);

0 commit comments

Comments
 (0)