refactor #84: 테스트 뷰(홈) API 수정

Nexters · Aug 31, 2023 · 7949bfe · 7949bfe
1 parent d1aad3b
commit 7949bfe
Show file tree

Hide file tree

Showing 13 changed files with 148 additions and 307 deletions.
diff --git a/Projects/Domain/Sources/Client/KeymeTestsClient.swift b/Projects/Domain/Sources/Client/KeymeTestsClient.swift
@@ -35,12 +35,12 @@ private func getClient(with network: KeymeAPIManager) -> KeymeTestsClient {
             let api = KeymeAPI.test(.onboarding)
             let response = try await network.request(api, object: KeymeTestsDTO.self)
 
-            return response.toIconModel()
+            return response.toKeymeTestsModel()
         }, fetchDailyTests: {
             let api = KeymeAPI.test(.daily)
             let response = try await network.request(api, object: KeymeTestsDTO.self)
 
-            return response.toIconModel()
+            return response.toKeymeTestsModel()
         }, fetchTestResult: { testResultId in
             let api = KeymeAPI.test(.result(testResultId))
             let response = try await network.request(api, object: TestResultDTO.self)

diff --git a/Projects/Domain/Sources/Client/TestClient.swift b/Projects/Domain/Sources/Client/TestClient.swift
diff --git a/Projects/Domain/Sources/Model/KeymeTestsModel.swift b/Projects/Domain/Sources/Model/KeymeTestsModel.swift
@@ -13,7 +13,6 @@ import Network
 import Kingfisher
 
 public struct KeymeTestsModel: Equatable {
-    public let nickname: String
     public let testId: Int
     public let icons: [IconModel]
 }
@@ -26,14 +25,12 @@ public struct IconModel: Equatable, Hashable {
 }
 
 public extension KeymeTestsDTO {
-    func toIconModel() -> KeymeTestsModel {
-        let nickname = data.owner.nickname
+    func toKeymeTestsModel() -> KeymeTestsModel {
         let icons = data.questions.map {
             IconModel(imageURL: $0.category.iconUrl,
                       color: Color.hex($0.category.color))
         }
-        return KeymeTestsModel(nickname: nickname ?? "키미",
-                               testId: data.testId,
-                               icons: icons)
+
+        return KeymeTestsModel(testId: data.testId, icons: icons)
     }
 }
diff --git a/Projects/Domain/Sources/Model/TestModel.swift b/Projects/Domain/Sources/Model/TestModel.swift
diff --git a/Projects/Features/Sources/Home/KeymeTestHomeFeature.swift b/Projects/Features/Sources/Home/KeymeTestHomeFeature.swift
@@ -7,6 +7,7 @@
 //
 
 import ComposableArchitecture
+import Domain
 import Network
 
 struct KeymeTestsHomeFeature: Reducer {
@@ -29,7 +30,7 @@ struct KeymeTestsHomeFeature: Reducer {
 
     enum Action {
         case fetchDailyTests
-        case showTestStartView(testId: Int)
+        case showTestStartView(testData: KeymeTestsModel)
         case startTest(PresentationAction<KeymeTestsStartFeature.Action>)
 
         enum View {}
@@ -41,14 +42,14 @@ struct KeymeTestsHomeFeature: Reducer {
             case .fetchDailyTests:
                 return .run { send in
                     let fetchedTest = try await network.request(.test(.daily), object: KeymeTestsDTO.self)
-                    let testId = fetchedTest.data.testId
+                    let testData = fetchedTest.toKeymeTestsModel()
 
-                    await send(.showTestStartView(testId: testId))
+                    await send(.showTestStartView(testData: testData))
                 }
 
-            case .showTestStartView(let testId):
-                state.view.dailyTestId = testId
-                state.testStartViewState = .init(nickname: state.view.nickname, testId: testId)
+            case .showTestStartView(let testData):
+                state.view.dailyTestId = testData.testId
+                state.testStartViewState = .init(nickname: state.view.nickname, testData: testData)
 
             default:
                 break

diff --git a/Projects/Features/Sources/Home/KeymeTestHomeView.swift b/Projects/Features/Sources/Home/KeymeTestHomeView.swift
@@ -7,28 +7,65 @@
 //
 
 import ComposableArchitecture
+import DSKit
 import SwiftUI
 
 struct KeymeTestsHomeView: View {
     var store: StoreOf<KeymeTestsHomeFeature>
 
     init(store: StoreOf<KeymeTestsHomeFeature>) {
         self.store = store
+        store.send(.fetchDailyTests)
     }
 
     var body: some View {
-        WithViewStore(store, observe: { $0 }) { viewStore in
-            let startTestStore = store.scope(
-                state: \.$testStartViewState,
-                action: KeymeTestsHomeFeature.Action.startTest)
-
-            IfLetStore(startTestStore) { store in
-                KeymeTestsStartView(store: store)
-            } else: {
-                EmptyView()
+        WithViewStore(store, observe: { $0.view }) { viewStore in
+            ZStack(alignment: .center) {
+                DSKitAsset.Color.keymeBlack.swiftUIColor.ignoresSafeArea()
+
+                VStack(alignment: .leading) {
+                    // Filler
+                    Spacer().frame(height: 75)
+
+                    welcomeText(nickname: viewStore.nickname)
+                        .foregroundColor(DSKitAsset.Color.keymeWhite.swiftUIColor)
+
+                    Spacer()
+                }
+                .fullFrame()
+                .padding(.horizontal, 16)
+
+                // 테스트 뷰
+                testView
+
+                // 결과 화면 표시도 생각
+
             }
+        }
+    }
+}
 
-            // 결과 화면 표시도 생각
+extension KeymeTestsHomeView {
+    var testView: some View {
+        let startTestStore = store.scope(
+            state: \.$testStartViewState,
+            action: KeymeTestsHomeFeature.Action.startTest)
+
+        return IfLetStore(startTestStore) { store in
+            KeymeTestsStartView(store: store)
+        } else: {
+            Circle()
+                .strokeBorder(.white.opacity(0.3), lineWidth: 1)
+                .background(Circle().foregroundColor(.white.opacity(0.3)))
+                .frame(width: 280, height: 280)
         }
     }
+
+    func welcomeText(nickname: String) -> some View {
+        Text.keyme(
+            "환영해요 \(nickname)님!",
+//            "환영해요 \(viewStore.nickname)님!\n이제 문제를 풀어볼까요?",
+            font: .heading1)
+    }
+
 }
diff --git a/Projects/Features/Sources/Home/KeymeTestsStartFeature.swift b/Projects/Features/Sources/Home/KeymeTestsStartFeature.swift
@@ -14,21 +14,20 @@ import Domain
 public struct KeymeTestsStartFeature: Reducer {
     public struct State: Equatable {
         public let nickname: String
-        public var testId: Int
-
+        public let testData: KeymeTestsModel
+
+        public var icon: IconModel = .EMPTY
         public var keymeTests: KeymeTestsFeature.State?
         public var isAnimating: Bool = false
-        public var icon: IconModel = .EMPTY
 
-        public init(nickname: String, testId: Int) {
+        public init(nickname: String, testData: KeymeTestsModel) {
             self.nickname = nickname
-            self.testId = testId
+            self.testData = testData
         }
     }
 
     public enum Action {
         case viewWillAppear
-        case fetchDailyTests(TaskResult<KeymeTestsModel>)
         case startAnimation([IconModel])
         case setIcon(IconModel)
         case startButtonDidTap
@@ -44,22 +43,8 @@ public struct KeymeTestsStartFeature: Reducer {
         Reduce { state, action in
             switch action {
             case .viewWillAppear:
-                return .run { send in
-                    await send(.fetchDailyTests(
-                        TaskResult {
-                            try await self.keymeTestsClient.fetchDailyTests()
-                        }
-                    ))
-                }
-
-            case let .fetchDailyTests(.success(tests)):
-                state.testId = tests.testId
                 state.isAnimating = true
-
-                return .send(.startAnimation(tests.icons))
-
-            case .fetchDailyTests(.failure):
-                return .send(.startAnimation([IconModel.EMPTY]))
+                return .send(.startAnimation(state.testData.icons))
 
             case .startAnimation(let icons):
                 return .run { send in
@@ -76,7 +61,7 @@ public struct KeymeTestsStartFeature: Reducer {
                 state.isAnimating = true
 
             case .startButtonDidTap:
-                let url = "https://keyme-frontend.vercel.app/test/\(state.testId)"
+                let url = "https://keyme-frontend.vercel.app/test/\(state.testData.testId)"
                 state.keymeTests = KeymeTestsFeature.State(url: url)
 
             case .keymeTests:

diff --git a/Projects/Features/Sources/Home/KeymeTestsStartView.swift b/Projects/Features/Sources/Home/KeymeTestsStartView.swift
@@ -24,48 +24,26 @@ public struct KeymeTestsStartView: View {
 
     public var body: some View {
         WithViewStore(store, observe: { $0 }) { viewStore in
-            VStack {
-                IfLetStore(
-                    self.store.scope(
-                        state: \.keymeTests,
-                        action: KeymeTestsStartFeature.Action.keymeTests
-                    ),
-                    then: { store in
-                        KeymeTestsView(store: store)
-                            .ignoresSafeArea(.all)
-                            .transition(.scale.animation(.easeIn))
-                    },
-                    else: {
-                        Spacer()
-                            .frame(height: 75)
-
-                        welcomeText(viewStore)
-
-                        Spacer()
-
-                        startTestsButton(viewStore)
-                            .onTapGesture {
-                                viewStore.send(.startButtonDidTap)
-                            }
-
-                        Spacer()
-                    }
-                )
-            }
-            .frame(maxWidth: .infinity)
-            .background(DSKitAsset.Color.keymeBlack.swiftUIColor)
+            IfLetStore(
+                self.store.scope(
+                    state: \.keymeTests,
+                    action: KeymeTestsStartFeature.Action.keymeTests
+                ),
+                then: { store in
+                    KeymeTestsView(store: store)
+                        .ignoresSafeArea(.all)
+                        .transition(.scale.animation(.easeIn))
+                },
+                else: {
+                    startTestsButton(viewStore)
+                        .onTapGesture {
+                            viewStore.send(.startButtonDidTap)
+                        }
+                }
+            )
         }
     }
 
-    func welcomeText(_ viewStore: ViewStore<KeymeTestsStartFeature.State, KeymeTestsStartFeature.Action>) -> some View {
-        Text.keyme(
-            "환영해요 \(viewStore.nickname ?? "키미")님!\n이제 문제를 풀어볼까요?",
-            font: .heading1) // TODO: 닉변
-        .foregroundColor(DSKitAsset.Color.keymeWhite.swiftUIColor)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .padding(Padding.insets(leading: 16))
-    }
-
     func startTestsButton(_ viewStore: ViewStore<KeymeTestsStartFeature.State,
                           KeymeTestsStartFeature.Action>) -> some View {
         ZStack {