fix #95 : 잔버그 수정

.
Nexters · Sep 19, 2023 · f70a4d5 · f70a4d5
1 parent 533c491
commit f70a4d5
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 49 deletions.
diff --git a/Encrypted/Secrets/GoogleService-Info.plist.encrypted b/Encrypted/Secrets/GoogleService-Info.plist.encrypted
diff --git a/Encrypted/XCConfig/App/DEV.xcconfig.encrypted b/Encrypted/XCConfig/App/DEV.xcconfig.encrypted
diff --git a/Encrypted/XCConfig/App/PROD.xcconfig.encrypted b/Encrypted/XCConfig/App/PROD.xcconfig.encrypted
diff --git a/Projects/Features/Sources/Home/DailyTestList/DailyTestListFeature.swift b/Projects/Features/Sources/Home/DailyTestList/DailyTestListFeature.swift
@@ -47,7 +47,6 @@ public struct DailyTestListFeature: Reducer {
             case .fetchDailyStatistics:
                 return .run { [testId = state.testData.testId] send in
                     let dailyStatisticsData = try await network.request(.test(.statistics(testId)), object: StatisticsDTO.self)
-//                    let dailyStatisticsData = try await network.requestWithSampleData(.test(.statistics(testId)), object: StatisticsDTO.self)
                     let dailyStatistics = dailyStatisticsData.toDailyStatisticsModel()
                     await send(.saveDailyStatistics(dailyStatistics))
                 }

diff --git a/Projects/Features/Sources/Home/DailyTestList/DailyTestListView.swift b/Projects/Features/Sources/Home/DailyTestList/DailyTestListView.swift
@@ -109,8 +109,14 @@ extension DailyTestListView {
 
 extension DailyTestListView {
     func statisticsScoreText(score: Double?) -> some View {
-        Text.keyme(score != nil ? "평균점수 | \(String(describing: score))점" : "아직 아무도 풀지 않았어요",
-                   font: .body4)
-        .foregroundColor(.white.opacity(0.5))
+        let text: String
+        if let score {
+            text = "평균점수 | \(score)점"
+        } else {
+            text = "아직 아무도 풀지 않았어요"
+        }
+
+        return Text.keyme(text, font: .body4)
+            .foregroundColor(.white.opacity(0.5))
     }
 }
diff --git a/Projects/Features/Sources/Home/HomeFeature.swift b/Projects/Features/Sources/Home/HomeFeature.swift
@@ -45,6 +45,7 @@ public struct HomeFeature: Reducer {
         case saveIsSolved(Bool)
         case saveTestId(Int)
         case showTestStartView(testData: KeymeTestsModel)
+        case showTestResultView(testData: KeymeTestsModel)
         case showErrorAlert(HomeFeatureError)
 
         case alert(PresentationAction<Alert>)
@@ -59,11 +60,19 @@ public struct HomeFeature: Reducer {
 
         public enum HomeFeatureError: LocalizedError {
             case cannotGetAuthorizationInformation
+            case cannotGenerateTestLink
+            case network
 
             public var errorDescription: String? {
                 switch self {
                 case .cannotGetAuthorizationInformation:
                     return "로그인 정보를 불러올 수 없습니다. 다시 로그인을 진행해주세요."
+
+                case .cannotGenerateTestLink:
+                    return "링크를 생성할 수 없습니다. 잠시 후 다시 시도해주세요."
+
+                case .network:
+                    return ""
                 }
             }
         }
@@ -77,11 +86,19 @@ public struct HomeFeature: Reducer {
             case .fetchDailyTests:
                 return .run { send in
                     let fetchedTest = try await network.request(.test(.daily), object: KeymeTestsDTO.self)
-//                    let fetchedTest = try await network.requestWithSampleData(.test(.onboarding), object: KeymeTestsDTO.self)
+
                     let testData = fetchedTest.toKeymeTestsModel()
-                    await send(.saveIsSolved(fetchedTest.data.testResultId != nil))
+
+                    await send(.saveIsSolved(fetchedTest.isSolved))
                     await send(.saveTestId(testData.testId))
-                    await send(.showTestStartView(testData: testData))
+
+                    if !fetchedTest.isSolved {
+                        await send(.showTestStartView(testData: testData))
+                    } else {
+                        await send(.showTestResultView(testData: testData))
+                    }
+                } catch: { _, send in
+                    await send(.showErrorAlert(.network))
                 }
 
             case let .saveIsSolved(isSolved):
@@ -101,19 +118,28 @@ public struct HomeFeature: Reducer {
                     testData: testData,
                     authorizationToken: authorizationToken
                 )
+
+            case .showTestResultView(let testData):
+                state.view.dailyTestId = testData.testId
+                guard let authorizationToken = state.authorizationToken else {
+                    return .send(.showErrorAlert(.cannotGetAuthorizationInformation))
+                }
 
-                state.dailyTestListState =
-                DailyTestListFeature.State(
+                state.dailyTestListState = DailyTestListFeature.State(
                     testData: testData
                 )
+
             case .showErrorAlert(let error):
-                if case .cannotGetAuthorizationInformation = error {
-                    state.alertState = AlertState.errorWithMessage(
-                        error.localizedDescription,
-                        actions: {
-                            ButtonState(action: .error(.cannotGetAuthorizationInformation), label: { TextState("닫기") })
-                        })
+                if case .network = error {
+                    state.alertState = .errorWhileNetworking
+                    return .none
                 }
+
+                state.alertState = AlertState.errorWithMessage(
+                    error.localizedDescription,
+                    actions: {
+                        ButtonState(action: .error(.cannotGetAuthorizationInformation), label: { TextState("닫기") })
+                    })
                 return .none
 
             case .alert(.presented(.error(let error))):
@@ -128,6 +154,7 @@ public struct HomeFeature: Reducer {
 
             return .none
         }
+        .ifLet(\.$alertState, action: /Action.alert)
         .ifLet(\.$startTestState, action: /Action.startTest) {
             StartTestFeature()
         }

diff --git a/Projects/Features/Sources/Home/HomeView.swift b/Projects/Features/Sources/Home/HomeView.swift
@@ -102,8 +102,13 @@ extension HomeView {
         .frame(height: 60)
         .onTapGesture {
             Task {
+                guard let testId = viewStore.testId else {
+                    viewStore.send(.showErrorAlert(.cannotGenerateTestLink))
+                    return
+                }
+
                 if viewStore.isSolvedDailyTest {
-                    let url = "https://keyme-frontend.vercel.app/test/\(viewStore.testId)"
+                    let url = "https://keyme-frontend.vercel.app/test/\(testId)"
                     let shortURL = try await shortURLAPIManager.request(
                         .shortenURL(longURL: url),
                         object: BitlyResponse.self).link

diff --git a/Projects/Features/Sources/Onboarding/OnboardingFeature.swift b/Projects/Features/Sources/Onboarding/OnboardingFeature.swift
@@ -101,17 +101,17 @@ public struct OnboardingFeature: Reducer {
                 state.isButtonShown = false
 
             case .lottieEnded:
+                state.isButtonShown = true
+
                 if state.lottieType == .splash3 {
                     state.lottieType = .question
                     state.isLoop = true
                     return .run { send in
                         await send(.fetchOnboardingTests(
-                            TaskResult { try await self.keymeTestsClient.fetchOnboardingTests()
-                            }
+                            TaskResult { try await self.keymeTestsClient.fetchOnboardingTests() }
                         ))
                     }
                 } else {
-                    state.isButtonShown = true
                     state.isLoop = true
                 }
 

diff --git a/Projects/Features/Sources/Onboarding/OnboardingView.swift b/Projects/Features/Sources/Onboarding/OnboardingView.swift
@@ -13,7 +13,7 @@ import Core
 import DSKit
 
 public struct OnboardingView: View {
-    @EnvironmentObject var webViewSetup: KeymeWebViewSetup
+    @StateObject var webViewSetup = KeymeWebViewSetup()
 
     private let store: StoreOf<OnboardingFeature>
 
@@ -104,38 +104,43 @@ public struct OnboardingView: View {
 
             Spacer()
 
-            if viewStore.lottieType == .question {
-                Color.clear
-                    .contentShape(Circle())
-                    .onTapGesture {
-                        HapticManager.shared.boong()
-                        viewStore.send(.startButtonDidTap)
-                    }
-            }
-
-            Spacer()
-
-            ZStack {
-                Rectangle()
-                    .cornerRadius(16)
-                    .foregroundColor(DSKitAsset.Color.keymeWhite.swiftUIColor)
-
-                Text("다음")
-                    .font(Font(DSKitFontFamily.Pretendard.bold.font(size: 18)))
-                    .foregroundColor(.black)
-            }
-            .onTapGesture {
-                HapticManager.shared.boong()
-                viewStore.send(.nextButtonDidTap)
-            }
-            .padding(Padding.insets(leading: 16, trailing: 16))
-            .frame(height: 60)
-            .opacity(viewStore.isButtonShown ? 1.0 : 0.0)
-            .animation(Animation.customInteractiveSpring(), value: viewStore.isButtonShown)
+            actionButton(for: viewStore.lottieType)
+                .onTapGesture {
+                    HapticManager.shared.boong()
+                    viewStore.send(
+                        viewStore.lottieType == .question ? .startButtonDidTap : .nextButtonDidTap
+                    )
+                }
+                .padding(Padding.insets(leading: 16, trailing: 16))
+                .frame(height: 60)
+                .opacity(viewStore.isButtonShown ? 1.0 : 0.0)
+                .animation(Animation.customInteractiveSpring(), value: viewStore.isButtonShown)
 
             Spacer()
                 .frame(height: 54)
         }
         .frame(maxWidth: .infinity)
     }
 }
+
+private extension OnboardingView {
+    func actionButton(for lottieType: LottieType) -> some View {
+        let buttonText: String
+        switch lottieType {
+        case .splash1, .splash2, .splash3:
+            buttonText = "다음"
+        case .question:
+            buttonText = "시작하기"
+        }
+
+        return ZStack {
+            Rectangle()
+                .cornerRadius(16)
+                .foregroundColor(DSKitAsset.Color.keymeWhite.swiftUIColor)
+
+            Text(buttonText)
+                .font(Font(DSKitFontFamily.Pretendard.bold.font(size: 18)))
+                .foregroundColor(.black)
+        }
+    }
+}
diff --git a/Projects/Network/Sources/DTO/KeymeTestsDTO.swift b/Projects/Network/Sources/DTO/KeymeTestsDTO.swift
@@ -33,6 +33,10 @@ public struct KeymeTestsDTO: Codable {
         let questionId: Int
         let title: String
     }
+
+    public var isSolved: Bool {
+        data.testResultId != nil
+    }
 }
 
 public struct Category: Codable {

diff --git a/Projects/Network/Sources/DTO/StatisticsDTO.swift b/Projects/Network/Sources/DTO/StatisticsDTO.swift
@@ -14,7 +14,7 @@ public struct StatisticsDTO: Codable {
     public let data: StatisticsData
 
     public struct StatisticsData: Codable {
-        public let averageRate: Int?
+        public let averageRate: Double?
         public let questionsStatistics: [QuestionsStatisticsData]
         public let solvedCount: Int
     }