[Chore] #177 - 도메인 엔티티 변경에 따른 수정

Author: Remaked-Swain

Neki-iOS/Core/Sources/Auth/Sources/Presentation/Sources/Feature/TermsAgreementFeature.swift

@@ -13,28 +13,22 @@ import os
 public struct TermsAgreementFeature {
     @ObservableState
     public struct State {
-        var agreements: IdentifiedArrayOf<UserAgreement>
+        var agreements: IdentifiedArrayOf<UserAgreement> = []
         var isAllAgreed: Bool { agreements.allSatisfy(\.isAgreed) }
-        var isConfirmButtonEnabled: Bool { agreements.filter(\.isRequired).allSatisfy(\.isAgreed) }
+        var isConfirmButtonEnabled: Bool { agreements.filter(\.term.isRequired).allSatisfy(\.isAgreed) }
         var isLoading: Bool = false
-        
-        public init() {
-            self.agreements = [
-                UserAgreement(type: .serviceUsage),
-                UserAgreement(type: .privacyPolicy),
-                UserAgreement(type: .locationService)
-            ]
-        }
     }
 
     public enum Action: BindableAction {
         // View Actions
-        case toggleAgreement(TermsType)
+        case onAppear
+        case toggleAgreement(UserAgreement)
         case toggleAllAgreements
         case confirmButtonTapped
-        case termPageLinkTapped(TermsType)
+        case termPageLinkTapped(UserAgreement)
 
         // Internal Actions
+        case fetchTermsResponse(Result<[Term], Error>)
         case agreeTermsResponse(Result<Void, Error>)
 
         // Delegate Actions
@@ -52,24 +46,41 @@ public struct TermsAgreementFeature {
 
         Reduce { (state: inout State, action: Action) -> Effect<Action> in
             switch action {
-            case let .toggleAgreement(type):
-                state.agreements[id: type.id]?.isAgreed.toggle()
+            case .onAppear:
+                state.isLoading = true
+                return .run { send in
+                    await send(.fetchTermsResponse(Result { try await authClient.fetchTerms() }))
+                }
+                
+            case let .toggleAgreement(agreement):
+                state.agreements[id: agreement.id]?.isAgreed.toggle()
                 return .none
 
             case .toggleAllAgreements:
                 let shouldAgreeAll = state.isAllAgreed == false
-                for type in TermsType.allCases { state.agreements[id: type.id]?.isAgreed = shouldAgreeAll }
+                for id in state.agreements.ids { state.agreements[id: id]?.isAgreed = shouldAgreeAll }
                 return .none
 
             case .confirmButtonTapped:
                 guard state.isConfirmButtonEnabled, state.isLoading == false else { return .none }
                 state.isLoading = true
-                let agreementsToSend: [TermAgreement] = state.agreements.map { (id: $0.id, agreed: $0.isAgreed) }
+                let agreementsToSend = Array(state.agreements)
 
                 return .run { send in
                     await send(.agreeTermsResponse(Result { try await authClient.agreeWithTerms(agreementsToSend) }))
                 }
 
+            case let .fetchTermsResponse(.success(terms)):
+                let userAgreements = terms.map { UserAgreement(term: $0) }
+                state.agreements = IdentifiedArray(uniqueElements: userAgreements)
+                state.isLoading = false
+                return .none
+                
+            case let .fetchTermsResponse(.failure(error)):
+                state.isLoading = false
+                Logger.presentation.error("Error occured while fetching terms: \(error)")
+                return .none
+                
             case .agreeTermsResponse(.success):
                 state.isLoading = false
                 return .send(.didFinishOnboarding)
@@ -79,15 +90,9 @@ public struct TermsAgreementFeature {
                 Logger.presentation.error("Error occured while agreeing to terms: \(error)")
                 return .none
 
-            case let .termPageLinkTapped(type):
-                let urlString: String
-                switch type {
-                case .serviceUsage: urlString = "https://lydian-tip-26b.notion.site/2ee0d9441db0807c8684ce3e2d4b8aca?source=copy_link"
-                case .privacyPolicy: urlString = "https://lydian-tip-26b.notion.site/2ee0d9441db0807cb850f78145db6dd3?pvs=74"
-                case .locationService: urlString = "https://lydian-tip-26b.notion.site/2ee0d9441db080b48223fb0b3263da08?pvs=74"
-                }
+            case let .termPageLinkTapped(agreement):
                 return .run { _ in
-                    guard let url = URL(string: urlString) else { return }
+                    guard let url = agreement.term.termInformationURL else { return }
                     await openURL(url)
                 }
 

Neki-iOS/Core/Sources/Auth/Sources/Presentation/Sources/View/TermsAgreementView.swift

@@ -14,31 +14,38 @@ public struct TermsAgreementView: View {
     @Bindable var store: StoreOf<TermsAgreementFeature>
 
     public var body: some View {
-        VStack(alignment: .leading, spacing: 12) {
-            Image(.iconGpicAgreement)
-                .padding(.horizontal, 20)
-                .padding(.top, 12)
-            
-            terms
+        ZStack {
+            VStack(alignment: .leading, spacing: 12) {
+                Image(.iconGpicAgreement)
+                    .padding(.horizontal, 20)
+                    .padding(.top, 12)
+                
+                terms
+                    .padding(.horizontal, 20)
+                
+                Spacer()
+                
+                Button {
+                    store.send(.confirmButtonTapped)
+                } label: {
+                    Text("다음으로")
+                }
+                .buttonStyle(.nekiCTA())
+                .disabled(store.isConfirmButtonEnabled == false)
                 .padding(.horizontal, 20)
-            
-            Spacer()
-            
-            Button {
-                store.send(.confirmButtonTapped)
-            } label: {
-                Text("다음으로")
+                
             }
-            .buttonStyle(.nekiCTA())
-            .disabled(store.isConfirmButtonEnabled == false)
-            .padding(.horizontal, 20)
 
+            if store.isLoading {
+                LoadingView()
+            }
         }
         .nekiToolbar {
             NekiToolBar.back { dismiss() }
         } center: {
             NekiToolBar.textCenter("이용약관")
         }
+        .task { await store.send(.onAppear).finish() }
     }
 
     private var terms: some View {
@@ -78,36 +85,34 @@ public struct TermsAgreementView: View {
             }
 
             VStack(alignment: .leading, spacing: 0) {
-                ForEach(TermsType.allCases) { type in
-                    HStack(alignment: .center, spacing: 0) {
+                ForEach(store.agreements) { agreement in
+                    HStack(alignment: .center, spacing: .zero) {
                         Button {
-                            store.send(.toggleAgreement(type))
+                            store.send(.toggleAgreement(agreement))
                         } label: {
-                            HStack(alignment: .center, spacing: 0) {
-                                if let agreement = store.agreements[id: type.id] {
-                                    Image(agreement.isAgreed ? .iconCheckmark : .iconCheckmarkGray)
-                                        .frame(width: 44, height: 44)
-                                        .scaledToFit()
+                            HStack(alignment: .center, spacing: .zero) {
+                                Image(agreement.isAgreed ? .iconCheckmark : .iconCheckmarkGray)
+                                    .frame(width: 44, height: 44)
+                                    .scaledToFit()
+                                
+                                HStack(alignment: .center, spacing: 2) {
+                                    Text(agreement.term.isRequired ? "(필수)" : "(선택)")
+                                        .nekiFont(.body14Medium)
+                                        .foregroundStyle(.gray500)
 
-                                    HStack(alignment: .center, spacing: 2) {
-                                        Text(agreement.isRequired ? "(필수)" : "(선택)")
-                                            .nekiFont(.body14Medium)
-                                            .foregroundStyle(.gray500)
-                                        
-                                        Text(type.displayName)
-                                            .nekiFont(.body16Medium)
-                                            .foregroundStyle(.gray900)
-                                            .frame(maxWidth: .infinity, alignment: .leading)
-                                            .padding(.vertical)
-                                    }
+                                    Text(agreement.term.title)
+                                        .nekiFont(.body16Medium)
+                                        .foregroundStyle(.gray900)
+                                        .frame(maxWidth: .infinity, alignment: .leading)
+                                        .padding(.vertical)
                                 }
                             }
                         }
 
                         Spacer()
 
                         Button {
-                            store.send(.termPageLinkTapped(type))
+                            store.send(.termPageLinkTapped(agreement))
                         } label: {
                             Image(.iconChevronRight)
                                 .resizable()
@@ -116,7 +121,6 @@ public struct TermsAgreementView: View {
                     }
                 }
             }
-            
         }
     }
 }