diff --git a/Projects/Features/Sources/Home/KeymeTestsStartFeature.swift b/Projects/Features/Sources/Home/KeymeTestsStartFeature.swift index 6a788adc..98daceff 100644 --- a/Projects/Features/Sources/Home/KeymeTestsStartFeature.swift +++ b/Projects/Features/Sources/Home/KeymeTestsStartFeature.swift @@ -16,7 +16,7 @@ public struct KeymeTestsStartFeature: Reducer { public var keymeTests: KeymeTestsFeature.State? public var isAnimating: Bool = false public var nickname: String? - public var testId: Int = 5 // TODO: change + public var testId: Int = 18 // TODO: change public var icon: IconModel = .EMPTY public init() { } diff --git a/Projects/Features/Sources/KeymeTests/Result/CardView/KeymeCardView.swift b/Projects/Features/Sources/KeymeTests/Result/CardView/KeymeCardView.swift index bc2bbf36..a64b3d63 100644 --- a/Projects/Features/Sources/KeymeTests/Result/CardView/KeymeCardView.swift +++ b/Projects/Features/Sources/KeymeTests/Result/CardView/KeymeCardView.swift @@ -55,7 +55,7 @@ public struct KeymeCardView: View { Spacer() .frame(height: 8) - Text.keyme("\(testResult.nickname)의 애정표현 정도는?", font: .heading1) + Text.keyme("\(testResult.nickname)의 \(testResult.title) 정도는?", font: .heading1) .foregroundColor(.white) .multilineTextAlignment(.leading) diff --git a/Projects/Features/Sources/KeymeTests/Result/TestResultView.swift b/Projects/Features/Sources/KeymeTests/Result/TestResultView.swift index 07298dd1..2b21d327 100644 --- a/Projects/Features/Sources/KeymeTests/Result/TestResultView.swift +++ b/Projects/Features/Sources/KeymeTests/Result/TestResultView.swift @@ -118,8 +118,8 @@ public struct TestResultView: View { .onTapGesture { Task { // TODO: url 주석단거로 바꾸기 -// let url = "https://keyme-frontend.vercel.app/test/\(viewStore.testId)" - let url = "https://keyme-frontend.vercel.app/test/5" + let url = "https://keyme-frontend.vercel.app/test/\(17)" +// let url = "https://keyme-frontend.vercel.app/test/5" let shortURL = try await ShortUrlAPIManager.shared.request( .shortenURL(longURL: url), object: BitlyResponse.self).link diff --git a/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift b/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift index e8a0c732..cf034cc4 100644 --- a/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift +++ b/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift @@ -33,15 +33,13 @@ struct ScoreListFeature: Reducer { switch action { case .loadScores: return .run { send in - print("ACTION!") try await Task.sleep(until: .now + .seconds(0.5), clock: .continuous) await send(.saveScores( - totalCount: 3, - scores: [ - CharacterScore(score: Int.random(in: 1...5), date: Date()), - CharacterScore(score: Int.random(in: 1...5), date: Date().addingTimeInterval(-70)), - CharacterScore(score: Int.random(in: 1...5), date: Date().addingTimeInterval(-297)) - ] + totalCount: 42, + scores: (0..<42).map { i in + let randomInterval = TimeInterval(-2 * i) + return CharacterScore(score: Int.random(in: 1...5), date: Date().addingTimeInterval(randomInterval + Double(Int.random(in: 0...1)))) + } )) } diff --git a/Projects/Features/Sources/Onboarding/OnboardingFeature.swift b/Projects/Features/Sources/Onboarding/OnboardingFeature.swift index 0e1d27f2..98fd5893 100644 --- a/Projects/Features/Sources/Onboarding/OnboardingFeature.swift +++ b/Projects/Features/Sources/Onboarding/OnboardingFeature.swift @@ -57,7 +57,7 @@ public struct OnboardingFeature: Reducer { public var testResultState: TestResultFeature.State? public var status: Status = .notDetermined - public var testId: Int = 4 // TODO: 바꾸기 + public var testId: Int = 17 // TODO: 바꾸기 public var lottieType: LottieType = .splash1 public var isButtonShown: Bool = false public var isLoop: Bool = false diff --git a/Projects/Network/Sources/Network/API/KeymeTestsAPI.swift b/Projects/Network/Sources/Network/API/KeymeTestsAPI.swift index 565370d5..eea93c68 100644 --- a/Projects/Network/Sources/Network/API/KeymeTestsAPI.swift +++ b/Projects/Network/Sources/Network/API/KeymeTestsAPI.swift @@ -63,7 +63,7 @@ extension KeymeTestsAPI: BaseAPI { "code": 200, "message": "요청에 성공했습니다.", "data": { - "testId": 4, + "testId": 17, "testResultId": null, "solvedCount": 0, "title": "님은 돈관리를 잘한다", @@ -116,7 +116,7 @@ extension KeymeTestsAPI: BaseAPI { "message": "요청에 성공했습니다.", "data": { "testResultId": 391, - "testId": 4, + "testId": 17, "matchRate": 0.0, "results": [ {