Skip to content

Commit ae5dc9e

Browse files
committed
refactor: DTO 변환 로직 Mapper 클래스로 이동
1 parent 451d06b commit ae5dc9e

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package bitnagil.bitnagil_backend.recommendedRoutine.service;
22

33
import java.util.List;
4+
import java.util.Map;
45

56
import org.springframework.stereotype.Component;
67

8+
import bitnagil.bitnagil_backend.emotionMarble.domain.EmotionMarble;
79
import bitnagil.bitnagil_backend.recommendedRoutine.domain.RecommendedRoutine;
810
import bitnagil.bitnagil_backend.recommendedRoutine.domain.RecommendedSubRoutine;
11+
import bitnagil.bitnagil_backend.recommendedRoutine.domain.enums.RecommendedRoutineType;
912
import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineDto;
13+
import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineSearchResponse;
1014
import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineSearchResult;
1115
import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedSubRoutineSearchResult;
1216

@@ -51,4 +55,14 @@ public RecommendedSubRoutineSearchResult toRecommendedSubRoutineSearchResult(
5155
.recommendedSubRoutineName(recommendedSubRoutine.getSubRoutineName())
5256
.build();
5357
}
58+
59+
// 추천 카테고리 별 루틴, 서브루틴을 반환하는 DTO로 변환
60+
public RecommendedRoutineSearchResponse toRecommendedRoutineSearchResponse(
61+
Map<RecommendedRoutineType, List<RecommendedRoutineSearchResult>> response, EmotionMarble emotionMarble) {
62+
63+
return RecommendedRoutineSearchResponse.builder()
64+
.recommendedRoutines(response)
65+
.emotionMarbleType(emotionMarble == null ? null : emotionMarble.getEmotionMarbleType()) // 감정 구슬 타입 설정
66+
.build();
67+
}
5468
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ public RecommendedRoutineSearchResponse searchRecommendedRoutines(User user) {
6565
// 맞춤추천 이외의 카테고리에 대한 추천 루틴을 response 추가
6666
addCategoryRecommendedRoutines(response);
6767

68-
return RecommendedRoutineSearchResponse.builder()
69-
.recommendedRoutines(response)
70-
.emotionMarbleType(emotionMarble == null ? null : emotionMarble.getEmotionMarbleType()) // 감정 구슬 타입 설정
71-
.build();
68+
return recommendedRoutineMapper.toRecommendedRoutineSearchResponse(response, emotionMarble);
7269
}
7370

7471
/**
@@ -108,7 +105,7 @@ private void addCategoryRecommendedRoutines(Map<RecommendedRoutineType, List<Rec
108105
}
109106
}
110107

111-
private EmotionMarble addPersonalizedRecommendedRoutine(User user, LocalDate nowDate,
108+
private EmotionMarble addPersonalizedRecommendedRoutine(User user, LocalDate nowDate,
112109
Map<RecommendedRoutineType, List<RecommendedRoutineSearchResult>> response) {
113110
// 감정구슬(당일에 감정구슬을 선택한 경우만 조회)
114111
EmotionMarble emotionMarble = emotionMarbleRepository.findByUserIdAndDateIs(user.getUserPk().getId(), nowDate);

0 commit comments

Comments
 (0)