✨ :: [#438] LikeDomain 모듈 작업 완료 및 레거시 제거

wakmusic · Mar 10, 2024 · 3a79c0e · 3a79c0e
1 parent 4d48e6b
commit 3a79c0e
Show file tree

Hide file tree

Showing 25 changed files with 79 additions and 62 deletions.
diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -38,7 +38,8 @@ let targets: [Target] = [
             .domain(target: .ArtistDomain),
             .domain(target: .AuthDomain),
             .domain(target: .ChartDomain),
-            .domain(target: .FaqDomain)
+            .domain(target: .FaqDomain),
+            .domain(target: .LikeDomain)
         ],
         settings: .settings(
             base: env.baseSetting,

diff --git a/Projects/App/Sources/Application/AppComponent+Like.swift b/Projects/App/Sources/Application/AppComponent+Like.swift
@@ -7,11 +7,10 @@
 //
 
 import CommonFeature
-import DataModule
-import DomainModule
-import NetworkModule
 import SignInFeature
 import StorageFeature
+import LikeDomain
+import LikeDomainInterface
 
 // MARK: 변수명 주의
 // AppComponent 내 변수 == Dependency 내 변수  이름 같아야함

diff --git a/Projects/App/Sources/Application/NeedleGenerated.swift b/Projects/App/Sources/Application/NeedleGenerated.swift
@@ -21,6 +21,8 @@ import FaqDomainInterface
 import Foundation
 import HomeFeature
 import KeychainModule
+import LikeDomain
+import LikeDomainInterface
 import MainTabFeature
 import NeedleFoundation
 import NetworkModule

diff --git a/...es/Like/Remote/RemoteLikeDataSource.swift → ...ace/DataSource/RemoteLikeDataSource.swift b/...es/Like/Remote/RemoteLikeDataSource.swift → ...ace/DataSource/RemoteLikeDataSource.swift
@@ -6,9 +6,6 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import DomainModule
-import ErrorModule
 import Foundation
 import RxSwift
 

diff --git a/...dule/Sources/Like/Entity/LikeEntity.swift → ...eDomain/Interface/Entity/LikeEntity.swift b/...dule/Sources/Like/Entity/LikeEntity.swift → ...eDomain/Interface/Entity/LikeEntity.swift
diff --git a/...rces/Like/Repository/LikeRepository.swift → ...Interface/Repository/LikeRepository.swift b/...rces/Like/Repository/LikeRepository.swift → ...Interface/Repository/LikeRepository.swift
@@ -6,8 +6,6 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import ErrorModule
 import Foundation
 import RxSwift
 

diff --git a/...es/Like/UseCases/AddLikeSongUseCase.swift → ...nterface/UseCase/AddLikeSongUseCase.swift b/...es/Like/UseCases/AddLikeSongUseCase.swift → ...nterface/UseCase/AddLikeSongUseCase.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
 import Foundation
 import RxSwift
 

diff --git a/...Like/UseCases/CancelLikeSongUseCase.swift → ...rface/UseCase/CancelLikeSongUseCase.swift b/...Like/UseCases/CancelLikeSongUseCase.swift → ...rface/UseCase/CancelLikeSongUseCase.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
 import Foundation
 import RxSwift
 

diff --git a/.../UseCases/FetchLikeNumOfSongUseCase.swift → ...e/UseCase/FetchLikeNumOfSongUseCase.swift b/.../UseCases/FetchLikeNumOfSongUseCase.swift → ...e/UseCase/FetchLikeNumOfSongUseCase.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
 import Foundation
 import RxSwift
 

diff --git a/Projects/Domains/LikeDomain/Project.swift b/Projects/Domains/LikeDomain/Project.swift
@@ -0,0 +1,21 @@
+import DependencyPlugin
+import ProjectDescription
+import ProjectDescriptionHelpers
+
+let project = Project.module(
+    name: ModulePaths.Domain.LikeDomain.rawValue,
+    targets: [
+        .interface(module: .domain(.LikeDomain)),
+        .implements(
+            module: .domain(.LikeDomain),
+            dependencies: [
+                .domain(target: .BaseDomain),
+                .domain(target: .LikeDomain, type: .interface)
+            ]
+        ),
+        .tests(
+            module: .domain(.LikeDomain),
+            dependencies: [.domain(target: .LikeDomain)]
+        )
+    ]
+)
diff --git a/...Services/APIKit/Sources/API/LikeAPI.swift → ...ains/LikeDomain/Sources/API/LikeAPI.swift b/...Services/APIKit/Sources/API/LikeAPI.swift → ...ains/LikeDomain/Sources/API/LikeAPI.swift
@@ -1,8 +1,8 @@
-import DataMappingModule
 import ErrorModule
 import Foundation
 import KeychainModule
 import Moya
+import BaseDomain
 
 public enum LikeAPI {
     case fetchLikeNumOfSong(id: String)

diff --git a/...ike/Remote/RemoteLikeDataSourceImpl.swift → ...DataSource/RemoteLikeDataSourceImpl.swift b/...ike/Remote/RemoteLikeDataSourceImpl.swift → ...DataSource/RemoteLikeDataSourceImpl.swift
@@ -1,9 +1,7 @@
-import APIKit
-import DataMappingModule
-import DomainModule
-import ErrorModule
 import Foundation
 import RxSwift
+import BaseDomain
+import LikeDomainInterface
 
 public final class RemoteLikeDataSourceImpl: BaseRemoteDataSource<LikeAPI>, RemoteLikeDataSource {
     public func fetchLikeNumOfSong(id: String) -> Single<LikeEntity> {

diff --git a/...ike/Repositories/LikeRepositoryImpl.swift → ...urces/Repository/LikeRepositoryImpl.swift b/...ike/Repositories/LikeRepositoryImpl.swift → ...urces/Repository/LikeRepositoryImpl.swift
@@ -6,14 +6,11 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DatabaseModule
-import DataMappingModule
-import DomainModule
 import ErrorModule
-import NetworkModule
+import LikeDomainInterface
 import RxSwift
 
-public struct LikeRepositoryImpl: LikeRepository {
+public final class LikeRepositoryImpl: LikeRepository {
     private let remoteLikeDataSource: any RemoteLikeDataSource
 
     public init(

diff --git a/.../Like/Response/FetchLikeResponseDTO.swift → ...es/ResponseDTO/FetchLikeResponseDTO.swift b/.../Like/Response/FetchLikeResponseDTO.swift → ...es/ResponseDTO/FetchLikeResponseDTO.swift
@@ -7,8 +7,15 @@
 //
 
 import Foundation
+import LikeDomainInterface
 
-public struct FetchLikeResponseDTO: Codable {
+public struct FetchLikeResponseDTO: Decodable {
     public let songId: String
     public let like: Int
 }
+
+public extension FetchLikeResponseDTO {
+    func toDomain() -> LikeEntity {
+        LikeEntity(status: 200, likes: like)
+    }
+}
diff --git a/...Like/DataTransfer/FetchLikeTransfer.swift → ...Sources/ResponseDTO/LikeResponseDTO.swift b/...Like/DataTransfer/FetchLikeTransfer.swift → ...Sources/ResponseDTO/LikeResponseDTO.swift
@@ -1,15 +1,18 @@
 //
-//  FetchLikeTransfer.swift
-//  NetworkModuleTests
+//  LikeResponseDTO.swift
+//  DataMappingModuleTests
 //
 //  Created by YoungK on 2023/04/03.
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import DomainModule
 import Foundation
-import Utility
+import LikeDomainInterface
+
+public struct LikeResponseDTO: Decodable {
+    public let status: Int?
+    public let like: Int
+}
 
 public extension LikeResponseDTO {
     func toDomain() -> LikeEntity {
@@ -19,9 +22,3 @@ public extension LikeResponseDTO {
         )
     }
 }
-
-public extension FetchLikeResponseDTO {
-    func toDomain() -> LikeEntity {
-        LikeEntity(status: 200, likes: like)
-    }
-}
diff --git a/...ike/UseCases/AddLikeSongUseCaseImpl.swift → ...rces/UseCase/AddLikeSongUseCaseImpl.swift b/...ike/UseCases/AddLikeSongUseCaseImpl.swift → ...rces/UseCase/AddLikeSongUseCaseImpl.swift
@@ -6,11 +6,9 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import DomainModule
-import ErrorModule
 import Foundation
 import RxSwift
+import LikeDomainInterface
 
 public struct AddLikeSongUseCaseImpl: AddLikeSongUseCase {
     private let likeRepository: any LikeRepository

diff --git a/.../UseCases/CancelLikeSongUseCaseImpl.swift → ...s/UseCase/CancelLikeSongUseCaseImpl.swift b/.../UseCases/CancelLikeSongUseCaseImpl.swift → ...s/UseCase/CancelLikeSongUseCaseImpl.swift
@@ -6,9 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import DomainModule
-import ErrorModule
+import LikeDomainInterface
 import Foundation
 import RxSwift
 

diff --git a/...Cases/FetchLikeNumOfSongUseCaseImpl.swift → ...eCase/FetchLikeNumOfSongUseCaseImpl.swift b/...Cases/FetchLikeNumOfSongUseCaseImpl.swift → ...eCase/FetchLikeNumOfSongUseCaseImpl.swift
@@ -6,9 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import DataMappingModule
-import DomainModule
-import ErrorModule
+import LikeDomainInterface
 import Foundation
 import RxSwift
 

diff --git a/Projects/Domains/LikeDomain/Tests/LikeDomainTest.swift b/Projects/Domains/LikeDomain/Tests/LikeDomainTest.swift
@@ -0,0 +1,11 @@
+import XCTest
+
+final class LikeDomainTests: XCTestCase {
+    override func setUpWithError() throws {}
+
+    override func tearDownWithError() throws {}
+
+    func testExample() {
+        XCTAssertEqual(1, 1)
+    }
+}
diff --git a/Projects/Features/PlayerFeature/Project.swift b/Projects/Features/PlayerFeature/Project.swift
@@ -1,10 +1,19 @@
+import DependencyPlugin
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-let project = Project.makeModule(
-    name: "PlayerFeature",
-    product: .staticFramework,
-    dependencies: [
-        .Project.Features.CommonFeature
+let project = Project.module(
+    name: ModulePaths.Feature.PlayerFeature.rawValue,
+    targets: [
+        .implements(
+            module: .feature(.PlayerFeature),
+            product: .staticFramework,
+            spec: .init(
+                dependencies: [
+                    .feature(target: .CommonFeature),
+                    .domain(target: .LikeDomain, type: .interface)
+                ]
+            )
+        )
     ]
 )
diff --git a/Projects/Features/PlayerFeature/Sources/Components/PlayerComponent.swift b/Projects/Features/PlayerFeature/Sources/Components/PlayerComponent.swift
@@ -2,6 +2,7 @@ import CommonFeature
 import DomainModule
 import Foundation
 import NeedleFoundation
+import LikeDomainInterface
 
 public protocol PlayerDependency: Dependency {
     var fetchLyricsUseCase: any FetchLyricsUseCase { get }

diff --git a/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel+API.swift b/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel+API.swift
@@ -10,6 +10,7 @@ import DomainModule
 import Foundation
 import RxSwift
 import Utility
+import LikeDomainInterface
 
 // MARK: - 뷰모델 내 API를 사용하는 함수들을 모아놓은 곳입니다.
 extension PlayerViewModel {

diff --git a/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel.swift b/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel.swift
@@ -15,6 +15,7 @@ import RxCocoa
 import RxSwift
 import Utility
 import YouTubePlayerKit
+import LikeDomainInterface
 
 final class PlayerViewModel: ViewModelType {
     struct Input {

diff --git a/Projects/Services/DataMappingModule/Sources/Like/Response/LikeResponseDTO.swift b/Projects/Services/DataMappingModule/Sources/Like/Response/LikeResponseDTO.swift
diff --git a/graph.png b/graph.png