Feat: 이용 약관 동의 로직 구현 (#T3-86)

choijungp · choijungp · commit d61d940d4cd3 · 2025-07-08T16:48:19.000+09:00
- 기존 TokenResponseDTO에서 LoginResponseDTO로 수정 (서버 응답에 User의 role이 추가되었음)
- AuthEndpoint에 agreements 케이스 추가
- AuthRepositoryProtocol 및 AuthRepository에 submitAgreements 정의 및 구현
- LoginUseCaseProtocol 및 LoginUseCase에 submitAgreements 정의 및 구현
- LoginViewModel에 submitAgreement 로직 구현
diff --git a/Projects/DataSource/Sources/DTO/BaseResponseDTO.swift b/Projects/DataSource/Sources/DTO/BaseResponseDTO.swift
@@ -10,3 +10,5 @@ struct BaseResponseDTO<T: Decodable>: Decodable {
     let data: T?
     let message: String
 }
+
+struct EmptyResponse: Decodable {}
diff --git a/Projects/DataSource/Sources/DTO/LoginResponseDTO.swift b/Projects/DataSource/Sources/DTO/LoginResponseDTO.swift
@@ -0,0 +1,31 @@
+//
+//  TokenResponseDTO.swift
+//  DataSource
+//
+//  Created by 최정인 on 6/30/25.
+//
+
+import Domain
+
+typealias LoginResponseDTO = BaseResponseDTO<LoginResponse>
+
+struct LoginResponse: Decodable {
+    let accessToken: String
+    let refreshToken: String
+    let userState: String
+
+    enum CodingKeys: String, CodingKey {
+        case accessToken
+        case refreshToken
+        case userState = "role"
+    }
+}
+
+extension LoginResponse {
+    func toUserEntity() -> UserEntity {
+        return UserEntity(
+            accessToken: accessToken,
+            refreshToken: refreshToken,
+            userState: UserState(rawValue: userState) ?? .guest)
+    }
+}
diff --git a/Projects/DataSource/Sources/DTO/TokenResponseDTO.swift b/Projects/DataSource/Sources/DTO/TokenResponseDTO.swift
diff --git a/Projects/DataSource/Sources/Endpoints/AuthEndpoint.swift b/Projects/DataSource/Sources/Endpoints/AuthEndpoint.swift
@@ -6,12 +6,14 @@
 //
 
 import Foundation
+import Domain
 
 enum AuthEndpoint {
     case login(socialLoginType: SocialLoginType, nickname: String?, token: String)
     case logout(accessToken: String)
     case withdraw(accessToken: String)
     case reissue(refreshToken: String)
+    case agreements(accessToken: String, agreements: [TermsType: Bool])
 }
 
 extension AuthEndpoint: Endpoint {
@@ -25,6 +27,7 @@ extension AuthEndpoint: Endpoint {
         case .logout: baseURL + "/logout"
         case .withdraw: baseURL + "/withdrawal"
         case .reissue: baseURL + "/token/reissue"
+        case .agreements: baseURL + "/agreements"
         }
     }
     
@@ -47,6 +50,8 @@ extension AuthEndpoint: Endpoint {
             headers["Authorization"] = "Bearer \(accessToken)"
         case .reissue(let refreshToken):
             headers["Refresh-Token"] = refreshToken
+        case .agreements(let accessToken, _):
+            headers["Authorization"] = "Bearer \(accessToken)"
         }
 
         return headers
@@ -64,8 +69,24 @@ extension AuthEndpoint: Endpoint {
                 parameters["nickname"] = nickname
             }
             return parameters
+        case .agreements(_, let agreements):
+            var parameters: [String: Any] = [:]
+            for agreement in agreements {
+                parameters[agreement.key.termKey] = agreement.value
+            }
+            return parameters
         default:
             return [:]
         }
     }
 }
+
+extension TermsType {
+    var termKey: String {
+        switch self {
+        case .service: "agreedToTermsOfService"
+        case .privacy: "agreedToPrivacyPolicy"
+        case .age: "isOverFourteen"
+        }
+    }
+}
diff --git a/Projects/DataSource/Sources/Repositories/AuthRepository.swift b/Projects/DataSource/Sources/Repositories/AuthRepository.swift
@@ -42,6 +42,13 @@ public final class AuthRepository: AuthRepositoryProtocol {
         try await requestServerLogin(socialType: .apple, nickname: savedNickname, token: authToken)
     }
 
+    public func submitAgreement(agreements: [TermsType : Bool]) async throws {
+        let accessToken = try loadToken(tokenType: .accessToken)
+        let endpoint = AuthEndpoint.agreements(accessToken: accessToken, agreements: agreements)
+        let response = try await networkService.request(endpoint: endpoint, type: BaseResponseDTO<EmptyResponse>.self)
+        BitnagilLogger.log(logType: .debug, message: "\(response)")
+    }
+
     public func logout() async throws {
         let accessToken = try loadToken(tokenType: .accessToken)
         let endpoint = AuthEndpoint.logout(accessToken: accessToken)
@@ -62,15 +69,16 @@ public final class AuthRepository: AuthRepositoryProtocol {
     public func reissueToken() async throws {
         let refreshToken = try loadToken(tokenType: .refreshToken)
         let endpoint = AuthEndpoint.reissue(refreshToken: refreshToken)
-        let tokenResponse = try await networkService.request(endpoint: endpoint, type: TokenResponseDTO.self)
+        let userResponse = try await networkService.request(endpoint: endpoint, type: LoginResponseDTO.self)
         guard
-            let tokenEntity = tokenResponse.data?.toTokenEntity(),
-            saveToken(tokenType: .accessToken, token: tokenEntity.accessToken),
-            saveToken(tokenType: .refreshToken, token: tokenEntity.refreshToken)
+            let userEntity = userResponse.data?.toUserEntity(),
+            saveToken(tokenType: .accessToken, token: userEntity.accessToken),
+            saveToken(tokenType: .refreshToken, token: userEntity.refreshToken)
         else { throw AuthError.tokenSaveFailed }
 
-        BitnagilLogger.log(logType: .debug, message: "AccessToken Saved: \(tokenEntity.accessToken)")
-        BitnagilLogger.log(logType: .debug, message: "RefreshToken Saved: \(tokenEntity.refreshToken)")
+        BitnagilLogger.log(logType: .debug, message: "User Logined: \(userEntity.userState)")
+        BitnagilLogger.log(logType: .debug, message: "AccessToken Saved: \(userEntity.accessToken)")
+        BitnagilLogger.log(logType: .debug, message: "RefreshToken Saved: \(userEntity.refreshToken)")
     }
     
     private func fetchKakaoToken() async throws -> String {
@@ -105,15 +113,16 @@ public final class AuthRepository: AuthRepositoryProtocol {
             nickname: nickname,
             token: token)
 
-        let tokenResponse = try await networkService.request(endpoint: endpoint, type: TokenResponseDTO.self)
+        let userResponse = try await networkService.request(endpoint: endpoint, type: LoginResponseDTO.self)
         guard
-            let tokenEntity = tokenResponse.data?.toTokenEntity(),
-            saveToken(tokenType: .accessToken, token: tokenEntity.accessToken),
-            saveToken(tokenType: .refreshToken, token: tokenEntity.refreshToken)
+            let userEntity = userResponse.data?.toUserEntity(),
+            saveToken(tokenType: .accessToken, token: userEntity.accessToken),
+            saveToken(tokenType: .refreshToken, token: userEntity.refreshToken)
         else { throw AuthError.tokenSaveFailed }
 
-        BitnagilLogger.log(logType: .debug, message: "AccessToken Saved: \(tokenEntity.accessToken)")
-        BitnagilLogger.log(logType: .debug, message: "RefreshToken Saved: \(tokenEntity.refreshToken)")
+        BitnagilLogger.log(logType: .debug, message: "User Logined: \(userEntity.userState)")
+        BitnagilLogger.log(logType: .debug, message: "AccessToken Saved: \(userEntity.accessToken)")
+        BitnagilLogger.log(logType: .debug, message: "RefreshToken Saved: \(userEntity.refreshToken)")
     }
 
     private func saveToken(tokenType: TokenType, token: String) -> Bool {
diff --git a/Projects/Domain/Sources/Entities/Enum/TermsType.swift b/Projects/Domain/Sources/Entities/Enum/TermsType.swift
@@ -0,0 +1,12 @@
+//
+//  TermsType.swift
+//  Domain
+//
+//  Created by 최정인 on 7/8/25.
+//
+
+public enum TermsType: CaseIterable {
+    case service
+    case privacy
+    case age
+}
diff --git a/Projects/Domain/Sources/Entities/Enum/UserState.swift b/Projects/Domain/Sources/Entities/Enum/UserState.swift
@@ -0,0 +1,11 @@
+//
+//  UserState.swift
+//  Domain
+//
+//  Created by 최정인 on 7/8/25.
+//
+
+public enum UserState: String {
+    case guest = "GUEST"
+    case user = "USER"
+}
diff --git a/Projects/Domain/Sources/Entities/TokenEntity.swift b/Projects/Domain/Sources/Entities/TokenEntity.swift
diff --git a/Projects/Domain/Sources/Entities/UserEntity.swift b/Projects/Domain/Sources/Entities/UserEntity.swift
@@ -0,0 +1,22 @@
+//
+//  UserEntity.swift
+//  Domain
+//
+//  Created by 최정인 on 6/30/25.
+//
+
+public struct UserEntity {
+    public let accessToken: String
+    public let refreshToken: String
+    public let userState: UserState
+
+    public init(
+        accessToken: String,
+        refreshToken: String,
+        userState: UserState
+    ) {
+        self.accessToken = accessToken
+        self.refreshToken = refreshToken
+        self.userState = userState
+    }
+}
diff --git a/Projects/Domain/Sources/Protocols/Repository/AuthRepositoryProtocol.swift b/Projects/Domain/Sources/Protocols/Repository/AuthRepositoryProtocol.swift
@@ -14,7 +14,10 @@ public protocol AuthRepositoryProtocol {
     ///   - nickname: Apple 계정의 이름입니다. 첫 로그인 시에만 전달되며 이후에는 UserDefaults에 저장된 값을 사용합니다.
     ///   - authToken: Apple로부터 발급받은 authorization token 값입니다.
     func appleLogin(nickname: String?, authToken: String) async throws
-    
+
+    /// 동의한 약관들에 대한 정보를 보냅니다.
+    func submitAgreement(agreements: [TermsType: Bool]) async throws
+
     /// 로그아웃을 진행합니다.
     func logout() async throws
 
diff --git a/Projects/Domain/Sources/Protocols/UseCase/LoginUseCaseProtocol.swift b/Projects/Domain/Sources/Protocols/UseCase/LoginUseCaseProtocol.swift
@@ -14,4 +14,8 @@ public protocol LoginUseCaseProtocol {
     ///   - nickname: Apple 계정의 이름입니다. 첫 로그인 시에만 전달되며 이후에는 UserDefaults에 저장된 값을 사용합니다.
     ///   - authToken: Apple로부터 발급받은 authorization token 값입니다.
     func appleLogin(nickname: String?, authToken: String) async throws
+
+    /// 동의한 약관들에 대한 정보를 보냅니다.
+    /// - Parameter agreements: 각 약관(TermsType)별 동의 여부를 나타내는 딕셔너리 값입니다.
+    func sumbitAgreement(agreements: [TermsType: Bool]) async throws
 }
diff --git a/Projects/Domain/Sources/UseCases/Auth/LoginUseCase.swift b/Projects/Domain/Sources/UseCases/Auth/LoginUseCase.swift
@@ -21,4 +21,8 @@ public final class LoginUseCase: LoginUseCaseProtocol {
     public func appleLogin(nickname: String?, authToken: String) async throws {
         try await authRepository.appleLogin(nickname: nickname, authToken: authToken)
     }
+
+    public func sumbitAgreement(agreements: [TermsType: Bool]) async throws {
+        try await authRepository.submitAgreement(agreements: agreements)
+    }
 }
diff --git a/Projects/NetworkService/Sources/NetworkService.swift b/Projects/NetworkService/Sources/NetworkService.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import DataSource
+import Shared
 
 public final class NetworkService: NetworkServiceProtocol {
     private let networkProvider: NetworkProviderProtocol
@@ -25,6 +26,7 @@ public final class NetworkService: NetworkServiceProtocol {
         }
 
         guard 200..<300 ~= httpResponse.statusCode else {
+            BitnagilLogger.log(logType: .error, message: "응답 코드: \(httpResponse.statusCode)")
             throw NetworkError.invalidStatusCode(statusCode: httpResponse.statusCode)
         }
 
diff --git a/Projects/Presentation/Sources/Login/Model/TermsAgreementState.swift b/Projects/Presentation/Sources/Login/Model/TermsAgreementState.swift
@@ -5,8 +5,10 @@
 //  Created by 최정인 on 7/8/25.
 //
 
+import Domain
+
 struct TermsAgreementState {
-    private var agreements: [TermsType: Bool] = [
+    private(set) var agreements: [TermsType: Bool] = [
         .service: false,
         .privacy: false,
         .age: false
diff --git a/Projects/Presentation/Sources/Login/Model/TermsType.swift b/Projects/Presentation/Sources/Login/Model/TermsType.swift
@@ -6,12 +6,9 @@
 //
 
 import Foundation
+import Domain
 
-public enum TermsType: CaseIterable {
-    case service
-    case privacy
-    case age
-
+extension TermsType {
     var title: String {
         switch self {
         case .service: "(필수) 서비스 이용약관 동의"
diff --git a/Projects/Presentation/Sources/Login/View/Components/TermsAgreementItemView.swift b/Projects/Presentation/Sources/Login/View/Components/TermsAgreementItemView.swift
@@ -5,6 +5,7 @@
 //  Created by 최정인 on 7/7/25.
 //
 
+import Domain
 import UIKit
 import SnapKit
 
diff --git a/Projects/Presentation/Sources/Login/ViewModel/LoginViewModel.swift b/Projects/Presentation/Sources/Login/ViewModel/LoginViewModel.swift
@@ -75,8 +75,15 @@ public final class LoginViewModel: ViewModel {
             agreementStateSubject.send(agreementState)
 
         case .submitAgreement:
-            // TODO: 전체 동의 API
-            print("서버통신")
+            Task {
+                do {
+                    let agreements = agreementStateSubject.value.agreements
+                    try await loginUseCase.sumbitAgreement(agreements: agreements)
+                    agreementResultSubject.send(true)
+                } catch {
+                    agreementResultSubject.send(false)
+                }
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,5 @@ struct BaseResponseDTO<T: Decodable>: Decodable {`
`10`	`10`	`let data: T?`
`11`	`11`	`let message: String`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+struct EmptyResponse: Decodable {}`