Merge pull request #180 from YAPP-Github/feat/#177-dynamic-terms

Remaked-Swain · web-flow · commit cb2fbf7e0768 · 2026-03-09T23:29:56.000+09:00
[Feat] #177 - 이용약관 변경 대비, 약관 내용 리모트
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Data/Sources/AuthEndpoint.swift b/Neki-iOS/Core/Sources/Auth/Sources/Data/Sources/AuthEndpoint.swift
@@ -11,6 +11,7 @@ import os
 enum AuthEndpoint {
     case reissueToken
     case login(dto: SocialLoginDTO.Request, provider: ProviderType)
+    case fetchTerms
     case agreeWithTerms(dto: AgreeTermsDTO.Request)
     
     case withdraw
@@ -26,7 +27,7 @@ extension AuthEndpoint: Endpoint {
     var authorizationType: AuthorizationType {
         switch self {
         case .reissueToken: return .reissue
-        case .login: return .none
+        case .login, .fetchTerms: return .none
         case .agreeWithTerms, .withdraw, .editNickname, .editProfileImage, .fetchUserInfo: return .bearer
         }
     }
@@ -45,6 +46,7 @@ extension AuthEndpoint: Endpoint {
         switch self {
         case .reissueToken: return "auth/refresh"
         case let .login(_, provider): return "auth/\(provider.name)/login"
+        case .fetchTerms: return "terms"
         case .agreeWithTerms: return "terms/agreements"
         case .withdraw: return "users/me"
         case .editNickname: return "users/me"
@@ -58,13 +60,13 @@ extension AuthEndpoint: Endpoint {
         case .reissueToken, .login, .agreeWithTerms: return .post
         case .withdraw: return .delete
         case .editNickname, .editProfileImage: return .patch
-        case .fetchUserInfo: return .get
+        case .fetchUserInfo, .fetchTerms: return .get
         }
     }
     
     var body: (any Encodable)? {
         switch self {
-        case .reissueToken, .fetchUserInfo, .withdraw: return nil
+        case .reissueToken, .fetchUserInfo, .fetchTerms, .withdraw: return nil
         case let .login(dto, _): return dto
         case let .agreeWithTerms(dto): return dto
         case let .editNickname(dto): return dto
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Data/Sources/DTOs/FetchTermsDTO.swift b/Neki-iOS/Core/Sources/Auth/Sources/Data/Sources/DTOs/FetchTermsDTO.swift
@@ -0,0 +1,29 @@
+//
+//  FetchTermsDTO.swift
+//  Neki-iOS
+//
+//  Created by SwainYun on 3/9/26.
+//
+
+import Foundation
+
+enum FetchTermsDTO {
+    struct Response: Decodable {
+        let terms: [TermDTO]
+    }
+}
+
+struct TermDTO: Decodable {
+    let id: Int
+    let termType: String?
+    let title: String
+    let termInformationURL: URL?
+    let isRequired: Bool
+    
+    enum CodingKeys: String, CodingKey {
+        case id, termType, title, isRequired
+        case termInformationURL = "url"
+    }
+    
+    func toEntity() -> Term { Term(id: id, title: title, isRequired: isRequired, termInformationURL: termInformationURL) }
+}
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Data/Sources/Implementations/DefaultAuthRepository.swift b/Neki-iOS/Core/Sources/Auth/Sources/Data/Sources/Implementations/DefaultAuthRepository.swift
@@ -102,8 +102,22 @@ public struct DefaultAuthRepository: AuthRepository {
         }
     }
     
-    public func agreeWithTerms(agreements: [TermAgreement]) async throws(AuthRepositoryError) {
-        let agreements = agreements.map { AgreementsDTO(termID: $0.id, agreed: $0.agreed) }
+    public func fetchTerms() async throws(AuthRepositoryError) -> [Term] {
+        let endpoint = AuthEndpoint.fetchTerms
+        
+        do {
+            let responseDTO: BaseResponseDTO<FetchTermsDTO.Response> = try await networkProvider.request(endpoint: endpoint)
+            guard let data = responseDTO.data else { throw AuthRepositoryError.networkError(.responseDecodingError) }
+            return data.terms.map { $0.toEntity() }
+        } catch let error as NetworkError {
+            throw .networkError(error)
+        } catch {
+            throw .unknown
+        }
+    }
+    
+    public func agreeWithTerms(agreements: [UserAgreement]) async throws(AuthRepositoryError) {
+        let agreements = agreements.map { AgreementsDTO(termID: $0.id, agreed: $0.isAgreed) }
         let dto = AgreeTermsDTO.Request(agreements: agreements)
         let endpoint = AuthEndpoint.agreeWithTerms(dto: dto)
         
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Clients/AuthClient.swift b/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Clients/AuthClient.swift
@@ -27,7 +27,8 @@ public struct AuthClient {
     public var loginWithApple: @Sendable (_ idToken: Data) async throws -> User
     public var loginWithKakao: @Sendable () async throws -> User
     public var autoLogin: @Sendable () async throws -> User
-    public var agreeWithTerms: @Sendable (_ agreements: [TermAgreement]) async throws -> Void
+    public var fetchTerms: @Sendable () async throws -> [Term]
+    public var agreeWithTerms: @Sendable (_ agreements: [UserAgreement]) async throws -> Void
     public var signOut: @Sendable () async throws -> Void
     public var withdraw: @Sendable () async throws -> Void
     public var updateProfile: @Sendable (_ nickname: String?, _ updateAction: ProfileImageUpdateAction) async throws -> User
@@ -81,7 +82,15 @@ extension AuthClient: DependencyKey {
             }
         }
         
-        @Sendable func agreeWithTerms(agreements: [TermAgreement]) async throws -> Void {
+        @Sendable func fetchTerms() async throws -> [Term] {
+            do {
+                return try await authRepository.fetchTerms()
+            } catch {
+                throw AuthClient.mapError(error)
+            }
+        }
+        
+        @Sendable func agreeWithTerms(agreements: [UserAgreement]) async throws -> Void {
             do {
                 try await authRepository.agreeWithTerms(agreements: agreements)
             } catch {
@@ -159,6 +168,7 @@ extension AuthClient: DependencyKey {
             loginWithApple: loginWithApple,
             loginWithKakao: loginWithKakao,
             autoLogin: autoLogin,
+            fetchTerms: fetchTerms,
             agreeWithTerms: agreeWithTerms,
             signOut: signOut,
             withdraw: withdraw,
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Entities/TermAgreement.swift b/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Entities/TermAgreement.swift
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Entities/TermsType.swift b/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Entities/TermsType.swift
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Entities/UserAgreement.swift b/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Entities/UserAgreement.swift
@@ -0,0 +1,33 @@
+//
+//  UserAgreement.swift
+//  Neki-iOS
+//
+//  Created by SwainYun on 1/25/26.
+//
+
+import Foundation
+
+public struct Term: Identifiable, Equatable, Sendable {
+    public let id: Int
+    public let title: String
+    public let isRequired: Bool
+    public let termInformationURL: URL?
+    
+    public init(id: Int, title: String, isRequired: Bool = true, termInformationURL: URL? = nil) {
+        self.id = id
+        self.title = title
+        self.isRequired = isRequired
+        self.termInformationURL = termInformationURL
+    }
+}
+
+public struct UserAgreement: Identifiable, Equatable, Sendable {
+    public var id: Int { term.id }
+    public let term: Term
+    public var isAgreed: Bool
+    
+    public init(term: Term, isAgreed: Bool = false) {
+        self.term = term
+        self.isAgreed = isAgreed
+    }
+}
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Interfaces/AuthRepository.swift b/Neki-iOS/Core/Sources/Auth/Sources/Domain/Sources/Interfaces/AuthRepository.swift
@@ -38,6 +38,8 @@ public protocol AuthRepository {
     func updateProfile(nickname: String?, editAction: ProfileImageEditAction) async throws(AuthRepositoryError) -> Void
     /// 자동 로그인 (유저 세션 복구)
     func restoreSession() async throws(AuthRepositoryError) -> User
+    /// 이용약관 목록 조회
+    func fetchTerms() async throws(AuthRepositoryError) -> [Term]
     /// 이용약관 동의
-    func agreeWithTerms(agreements: [TermAgreement]) async throws(AuthRepositoryError) -> Void
+    func agreeWithTerms(agreements: [UserAgreement]) async throws(AuthRepositoryError) -> Void
 }
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Presentation/Sources/Feature/TermsAgreementFeature.swift b/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)
                 }
                 
diff --git a/Neki-iOS/Core/Sources/Auth/Sources/Presentation/Sources/View/TermsAgreementView.swift b/Neki-iOS/Core/Sources/Auth/Sources/Presentation/Sources/View/TermsAgreementView.swift
