🔀 :: (#435) 도메인 모듈 분리 3차

Projects/App/Project.swift

@@ -34,8 +34,9 @@ let targets: [Target] = [
             .Project.Features.RootFeature,
             .Project.Module.ThirdPartyLib,
             .Project.Service.Data,
-            TargetDependency.domain(target: .AppDomain),
-            TargetDependency.domain(target: .ArtistDomain)
+            .domain(target: .AppDomain),
+            .domain(target: .ArtistDomain),
+            .domain(target: .AuthDomain)
         ],
         settings: .settings(
             base: env.baseSetting,

Projects/App/Sources/Application/AppComponent+Auth.swift

@@ -6,10 +6,9 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AuthDomain
+import AuthDomainInterface
 import CommonFeature
-import DataModule
-import DomainModule
-import NetworkModule
 import SignInFeature
 import StorageFeature
 

Projects/App/Sources/Application/NeedleGenerated.swift

@@ -5,6 +5,8 @@ import AppDomainInterface
 import ArtistDomain
 import ArtistDomainInterface
 import ArtistFeature
+import AuthDomain
+import AuthDomainInterface
 import BaseFeature
 import ChartFeature
 import CommonFeature

Projects/Services/NetworkModule/Sources/Auth/Remote/RemoteAuthDataSource.swift → Projects/Domains/AuthDomain/Interface/DataSource/RemoteAuthDataSource.swift

@@ -1,6 +1,3 @@
-import DataMappingModule
-import DomainModule
-import ErrorModule
 import Foundation
 import RxSwift
 

Projects/Services/DataMappingModule/Sources/Base/ProviderType.swift → Projects/Domains/AuthDomain/Interface/Enum/ProviderType.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum ProviderType: String, Codable {
+public enum ProviderType: String {
     case naver
     case apple
     case google

Projects/Services/DomainModule/Sources/Auth/Repository/AuthRepository.swift → Projects/Domains/AuthDomain/Interface/Repository/AuthRepository.swift

@@ -1,5 +1,3 @@
-import DataMappingModule
-import ErrorModule
 import Foundation
 import RxSwift
 

Projects/Services/DomainModule/Sources/Auth/UseCases/FetchNaverUserInfoUseCase.swift → Projects/Domains/AuthDomain/Interface/UseCase/FetchNaverUserInfoUseCase.swift

@@ -1,4 +1,3 @@
-import DataMappingModule
 import Foundation
 import RxSwift
 

Projects/Services/DomainModule/Sources/Auth/UseCases/FetchTokenUseCase.swift → Projects/Domains/AuthDomain/Interface/UseCase/FetchTokenUseCase.swift

@@ -1,4 +1,3 @@
-import DataMappingModule
 import Foundation
 import RxSwift
 

Projects/Domains/AuthDomain/Project.swift

@@ -0,0 +1,21 @@
+import DependencyPlugin
+import ProjectDescription
+import ProjectDescriptionHelpers
+
+let project = Project.module(
+    name: ModulePaths.Domain.AuthDomain.rawValue,
+    targets: [
+        .interface(module: .domain(.AuthDomain)),
+        .implements(
+            module: .domain(.AuthDomain),
+            dependencies: [
+                .domain(target: .BaseDomain),
+                .domain(target: .AuthDomain, type: .interface)
+            ]
+        ),
+        .tests(
+            module: .domain(.AuthDomain),
+            dependencies: [.domain(target: .AuthDomain)]
+        )
+    ]
+)

Projects/Services/APIKit/Sources/API/AuthAPI.swift → Projects/Domains/AuthDomain/Sources/API/AuthAPI.swift

@@ -1,7 +1,7 @@
-import DataMappingModule
+import AuthDomainInterface
+import BaseDomain
 import ErrorModule
 import Foundation
-import KeychainModule
 import Moya
 
 public enum AuthAPI {
@@ -53,7 +53,7 @@ extension AuthAPI: WMAPI {
 
     public var headers: [String: String]? {
         switch self {
-        case let .fetchNaverUserInfo(tokenType: tokenType, accessToken: accessToken):
+        case let .fetchNaverUserInfo(tokenType, accessToken):
             return ["Authorization": "\(tokenType) \(accessToken)"]
         default:
             return ["Content-Type": "application/json"]

Projects/Services/NetworkModule/Sources/Auth/Remote/RemoteAuthDataSourceImpl.swift → Projects/Domains/AuthDomain/Sources/DataSource/RemoteAuthDataSourceImpl.swift

@@ -1,7 +1,5 @@
-import APIKit
-import DataMappingModule
-import DomainModule
-import ErrorModule
+import AuthDomainInterface
+import BaseDomain
 import Foundation
 import RxSwift
 
@@ -12,8 +10,7 @@ public final class RemoteAuthDataSourceImpl: BaseRemoteDataSource<AuthAPI>, Remo
             .map { $0.toDomain() }
     }
 
-    public func fetchNaverUserInfo(tokenType: String, accessToken: String) -> RxSwift
-        .Single<DomainModule.NaverUserInfoEntity> {
+    public func fetchNaverUserInfo(tokenType: String, accessToken: String) -> Single<NaverUserInfoEntity> {
         request(.fetchNaverUserInfo(tokenType: tokenType, accessToken: accessToken))
             .map(NaverUserInfoResponseDTO.self)
             .map { $0.toDomain() }

Projects/Services/DataModule/Sources/Auth/Repositories/AuthRepositoryImpl.swift → Projects/Domains/AuthDomain/Sources/Repository/AuthRepositoryImpl.swift

@@ -6,14 +6,10 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DatabaseModule
-import DataMappingModule
-import DomainModule
-import ErrorModule
-import NetworkModule
+import AuthDomainInterface
 import RxSwift
 
-public struct AuthRepositoryImpl: AuthRepository {
+public final class AuthRepositoryImpl: AuthRepository {
     private let remoteAuthDataSource: any RemoteAuthDataSource
 
     public init(remoteAuthDataSource: RemoteAuthDataSource) {
@@ -24,8 +20,7 @@ public struct AuthRepositoryImpl: AuthRepository {
         remoteAuthDataSource.fetchToken(token: token, type: type)
     }
 
-    public func fetchNaverUserInfo(tokenType: String, accessToken: String) -> RxSwift
-        .Single<DomainModule.NaverUserInfoEntity> {
+    public func fetchNaverUserInfo(tokenType: String, accessToken: String) -> Single<NaverUserInfoEntity> {
         remoteAuthDataSource.fetchNaverUserInfo(tokenType: tokenType, accessToken: accessToken)
     }
 }

Projects/Services/DataMappingModule/Sources/Auth/Response/AuthLoginResponseDTO.swift → Projects/Domains/AuthDomain/Sources/ResponseDTO/AuthLoginResponseDTO.swift

@@ -6,11 +6,21 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AuthDomainInterface
 import Foundation
 
-public struct AuthLoginResponseDTO: Codable, Equatable {
+public struct AuthLoginResponseDTO: Decodable, Equatable {
     public let token: String
+
     public static func == (lhs: Self, rhs: Self) -> Bool {
         return lhs.token == rhs.token
     }
 }
+
+public extension AuthLoginResponseDTO {
+    func toDomain() -> AuthLoginEntity {
+        AuthLoginEntity(
+            token: token
+        )
+    }
+}

Projects/Services/DataMappingModule/Sources/Auth/Response/NaverUserInfoResponseDTO.swift → Projects/Domains/AuthDomain/Sources/ResponseDTO/NaverUserInfoResponseDTO.swift

@@ -6,19 +6,24 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AuthDomainInterface
 import Foundation
 
-public struct NaverUserInfoResponseDTO: Codable, Equatable {
+public struct NaverUserInfoResponseDTO: Decodable, Equatable {
+    public let resultcode, message: String
+    public let response: Response
+
     public static func == (lhs: NaverUserInfoResponseDTO, rhs: NaverUserInfoResponseDTO) -> Bool {
         lhs.response.id == rhs.response.id
     }
-
-    public let resultcode, message: String
-    public let response: Response
 }
 
 public extension NaverUserInfoResponseDTO {
     struct Response: Codable {
         public let id, nickname: String
     }
+
+    func toDomain() -> NaverUserInfoEntity {
+        NaverUserInfoEntity(resultcode: resultcode, message: message, id: response.id, nickname: response.nickname)
+    }
 }

Projects/Services/DataModule/Sources/Auth/UseCases/FetchNaverUserInfoUseCaseImpl.swift → Projects/Domains/AuthDomain/Sources/UseCase/FetchNaverUserInfoUseCaseImpl.swift

@@ -6,9 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import DomainModule
-import ErrorModule
+import AuthDomainInterface
 import Foundation
 import RxSwift
 

Projects/Services/DataModule/Sources/Auth/UseCases/FetchTokenUseCaseImpl.swift → Projects/Domains/AuthDomain/Sources/UseCase/FetchTokenUseCaseImpl.swift

@@ -6,9 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import DomainModule
-import ErrorModule
+import AuthDomainInterface
 import Foundation
 import RxSwift
 

Projects/Domains/AuthDomain/Tests/AuthDomainTest.swift

@@ -0,0 +1,11 @@
+import XCTest
+
+final class AuthDomainTests: XCTestCase {
+    override func setUpWithError() throws {}
+
+    override func tearDownWithError() throws {}
+
+    func testExample() {
+        XCTAssertEqual(1, 1)
+    }
+}

Projects/Features/SignInFeature/Project.swift

@@ -1,11 +1,20 @@
+import DependencyPlugin
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-let project = Project.makeModule(
-    name: "SignInFeature",
-    product: .staticFramework,
-    dependencies: [
-        .Project.Features.PlayerFeature
-    ],
-    resources: ["Resources/**"]
+let project = Project.module(
+    name: ModulePaths.Feature.SignInFeature.rawValue,
+    targets: [
+        .implements(
+            module: .feature(.SignInFeature),
+            product: .staticFramework,
+            spec: .init(
+                resources: ["Resources/**"],
+                dependencies: [
+                    .feature(target: .PlayerFeature),
+                    .domain(target: .AuthDomain, type: .interface)
+                ]
+            )
+        )
+    ]
 )

Projects/Features/SignInFeature/Sources/Components/SignInComponent.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AuthDomainInterface
 import DomainModule
 import Foundation
 import NeedleFoundation

Projects/Features/SignInFeature/Sources/ViewModels/LoginViewModel.swift

@@ -6,13 +6,14 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AuthDomainInterface
 import AuthenticationServices
 import BaseFeature
 import CryptoSwift
-import DataMappingModule
 import DomainModule
 import KeychainModule
 import NaverThirdPartyLogin
+import RxCocoa
 import RxRelay
 import RxSwift
 import Utility