Merge pull request #469 from wakmusic/feature/440-module-domain-8round

🔀 :: (#440) 도메인 모듈 분리 8차
wakmusic · Mar 11, 2024 · b3df8ac · b3df8ac
2 parents 927c0d9 + 9bf8e0b
commit b3df8ac
Show file tree

Hide file tree

Showing 230 changed files with 591 additions and 576 deletions.
diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -40,7 +40,10 @@ let targets: [Target] = [
             .domain(target: .ChartDomain),
             .domain(target: .FaqDomain),
             .domain(target: .LikeDomain),
-            .domain(target: .NoticeDomain)
+            .domain(target: .NoticeDomain),
+            .domain(target: .SongsDomain),
+            .domain(target: .PlayListDomain),
+            .domain(target: .UserDomain)
         ],
         settings: .settings(
             base: env.baseSetting,

diff --git a/Projects/App/Sources/Application/AppComponent+Chart.swift b/Projects/App/Sources/Application/AppComponent+Chart.swift
@@ -1,7 +1,7 @@
-import ChartFeature
-import CommonFeature
 import ChartDomain
 import ChartDomainInterface
+import ChartFeature
+import CommonFeature
 
 public extension AppComponent {
     var chartComponent: ChartComponent {

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

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

diff --git a/Projects/App/Sources/Application/AppComponent+Notice.swift b/Projects/App/Sources/Application/AppComponent+Notice.swift
@@ -7,9 +7,9 @@
 //
 
 import CommonFeature
-import StorageFeature
 import NoticeDomain
 import NoticeDomainInterface
+import StorageFeature
 
 public extension AppComponent {
     var noticePopupComponent: NoticePopupComponent {

diff --git a/Projects/App/Sources/Application/AppComponent+Playlist.swift b/Projects/App/Sources/Application/AppComponent+Playlist.swift
@@ -7,15 +7,13 @@
 //
 
 import CommonFeature
-import DataModule
-import DomainModule
-import NetworkModule
+import PlayListDomain
+import PlayListDomainInterface
 import SearchFeature
 import StorageFeature
 
 // MARK: 변수명 주의
 // AppComponent 내 변수 == Dependency 내 변수  이름 같아야함
-//
 
 public extension AppComponent {
     var beforeSearchComponent: BeforeSearchComponent {

diff --git a/Projects/App/Sources/Application/AppComponent+Songs.swift b/Projects/App/Sources/Application/AppComponent+Songs.swift
@@ -7,11 +7,10 @@
 //
 
 import CommonFeature
-import DataModule
-import DomainModule
 import HomeFeature
-import NetworkModule
 import SearchFeature
+import SongsDomain
+import SongsDomainInterface
 
 public extension AppComponent {
     var searchComponent: SearchComponent {

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

diff --git a/Projects/App/Sources/Application/NeedleGenerated.swift b/Projects/App/Sources/Application/NeedleGenerated.swift
@@ -29,6 +29,8 @@ import NetworkModule
 import NoticeDomain
 import NoticeDomainInterface
 import PanModal
+import PlayListDomain
+import PlayListDomainInterface
 import PlayerFeature
 import RootFeature
 import RxCocoa
@@ -37,8 +39,12 @@ import RxSwift
 import SearchFeature
 import SignInFeature
 import SnapKit
+import SongsDomain
+import SongsDomainInterface
 import StorageFeature
 import UIKit
+import UserDomain
+import UserDomainInterface
 import Utility
 
 // swiftlint:disable unused_declaration

diff --git a/Projects/Domains/BaseDomain/Sources/ResponseDTO/BaseResponseDTO.swift b/Projects/Domains/BaseDomain/Sources/ResponseDTO/BaseResponseDTO.swift
@@ -6,17 +6,15 @@
 //  Copyright © 2024 yongbeomkwak. All rights reserved.
 //
 
+import BaseDomainInterface
 import Foundation
 
 public struct BaseResponseDTO: Codable {
     public let status: Int
 }
 
-#warning("어떤 문제인지 기존 모듈과 충돌함")
-/*
- public extension BaseResponseDTO {
- func toDomain() -> BaseEntity {
- return BaseEntity(status: status)
- }
- }
- */
+public extension BaseResponseDTO {
+    func toDomain() -> BaseEntity {
+        return BaseEntity(status: status)
+    }
+}
diff --git a/Projects/Domains/ChartDomain/Sources/DataSource/RemoteChartDataSourceImpl.swift b/Projects/Domains/ChartDomain/Sources/DataSource/RemoteChartDataSourceImpl.swift
@@ -1,7 +1,7 @@
-import Foundation
-import RxSwift
 import BaseDomain
 import ChartDomainInterface
+import Foundation
+import RxSwift
 
 public final class RemoteChartDataSourceImpl: BaseRemoteDataSource<ChartAPI>, RemoteChartDataSource {
     public func fetchChartRanking(type: ChartDateType, limit: Int) -> Single<[ChartRankingEntity]> {

diff --git a/Projects/Domains/ChartDomain/Sources/Repository/ChartRepositoryImpl.swift b/Projects/Domains/ChartDomain/Sources/Repository/ChartRepositoryImpl.swift
@@ -1,6 +1,6 @@
+import ChartDomainInterface
 import Foundation
 import RxSwift
-import ChartDomainInterface
 
 public final class ChartRepositoryImpl: ChartRepository {
     private let remoteChartDataSource: any RemoteChartDataSource

diff --git a/Projects/Domains/ChartDomain/Sources/ResponseDTO/FetchChartRankingResponseDTO.swift b/Projects/Domains/ChartDomain/Sources/ResponseDTO/FetchChartRankingResponseDTO.swift
@@ -1,5 +1,5 @@
-import Foundation
 import ChartDomainInterface
+import Foundation
 import Utility
 
 public struct SingleChartRankingResponseDTO: Decodable, Equatable {

diff --git a/Projects/Domains/ChartDomain/Sources/UseCase/FetchChartRankingUseCaseImpl.swift b/Projects/Domains/ChartDomain/Sources/UseCase/FetchChartRankingUseCaseImpl.swift
@@ -1,5 +1,5 @@
-import RxSwift
 import ChartDomainInterface
+import RxSwift
 
 public struct FetchChartRankingUseCaseImpl: FetchChartRankingUseCase {
     private let chartRepository: any ChartRepository

diff --git a/Projects/Domains/ChartDomain/Sources/UseCase/FetchChartUpdateTimeUseCaseImpl.swift b/Projects/Domains/ChartDomain/Sources/UseCase/FetchChartUpdateTimeUseCaseImpl.swift
@@ -1,5 +1,5 @@
-import RxSwift
 import ChartDomainInterface
+import RxSwift
 
 public struct FetchChartUpdateTimeUseCaseImpl: FetchChartUpdateTimeUseCase {
     private let chartRepository: any ChartRepository

diff --git a/Projects/Domains/FaqDomain/Sources/API/FaqAPI.swift b/Projects/Domains/FaqDomain/Sources/API/FaqAPI.swift
@@ -1,8 +1,8 @@
+import BaseDomain
 import ErrorModule
 import Foundation
 import KeychainModule
 import Moya
-import BaseDomain
 
 public enum FaqAPI {
     case fetchFaqCategories

diff --git a/Projects/Domains/FaqDomain/Sources/DataSource/RemoteFaqDataSourceImpl.swift b/Projects/Domains/FaqDomain/Sources/DataSource/RemoteFaqDataSourceImpl.swift
@@ -1,7 +1,7 @@
-import Foundation
-import RxSwift
 import BaseDomain
 import FaqDomainInterface
+import Foundation
+import RxSwift
 
 public final class RemoteFaqDataSourceImpl: BaseRemoteDataSource<FaqAPI>, RemoteFaqDataSource {
     public func fetchCategories() -> Single<FaqCategoryEntity> {

diff --git a/Projects/Domains/FaqDomain/Sources/ResponseDTO/FaqCategoryResponseDTO.swift b/Projects/Domains/FaqDomain/Sources/ResponseDTO/FaqCategoryResponseDTO.swift
@@ -1,5 +1,5 @@
-import Foundation
 import FaqDomainInterface
+import Foundation
 
 public struct FaqCategoryResponseDTO: Decodable, Equatable {
     public let categories: [String]

diff --git a/Projects/Domains/FaqDomain/Sources/ResponseDTO/FaqResponseDTO.swift b/Projects/Domains/FaqDomain/Sources/ResponseDTO/FaqResponseDTO.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import Foundation
 import FaqDomainInterface
+import Foundation
 
 public struct FaqResponseDTO: Decodable {
     public let question, description: String

diff --git a/Projects/Domains/FaqDomain/Sources/UseCase/FetchFaqCategoriesUseCaseImpl.swift b/Projects/Domains/FaqDomain/Sources/UseCase/FetchFaqCategoriesUseCaseImpl.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import Foundation
 import FaqDomainInterface
+import Foundation
 import RxSwift
 
 public struct FetchFaqCategoriesUseCaseImpl: FetchFaqCategoriesUseCase {

diff --git a/Projects/Domains/FaqDomain/Sources/UseCase/FetchFaqUseCaseImpl.swift b/Projects/Domains/FaqDomain/Sources/UseCase/FetchFaqUseCaseImpl.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import Foundation
 import FaqDomainInterface
+import Foundation
 import RxSwift
 
 public struct FetchFaqUseCaseImpl: FetchFaqUseCase {

diff --git a/Projects/Domains/LikeDomain/Sources/API/LikeAPI.swift b/Projects/Domains/LikeDomain/Sources/API/LikeAPI.swift
@@ -1,8 +1,8 @@
+import BaseDomain
 import ErrorModule
 import Foundation
 import KeychainModule
 import Moya
-import BaseDomain
 
 public enum LikeAPI {
     case fetchLikeNumOfSong(id: String)

diff --git a/Projects/Domains/LikeDomain/Sources/DataSource/RemoteLikeDataSourceImpl.swift b/Projects/Domains/LikeDomain/Sources/DataSource/RemoteLikeDataSourceImpl.swift
@@ -1,7 +1,7 @@
-import Foundation
-import RxSwift
 import BaseDomain
+import Foundation
 import LikeDomainInterface
+import RxSwift
 
 public final class RemoteLikeDataSourceImpl: BaseRemoteDataSource<LikeAPI>, RemoteLikeDataSource {
     public func fetchLikeNumOfSong(id: String) -> Single<LikeEntity> {

diff --git a/Projects/Domains/LikeDomain/Sources/UseCase/AddLikeSongUseCaseImpl.swift b/Projects/Domains/LikeDomain/Sources/UseCase/AddLikeSongUseCaseImpl.swift
@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import RxSwift
 import LikeDomainInterface
+import RxSwift
 
 public struct AddLikeSongUseCaseImpl: AddLikeSongUseCase {
     private let likeRepository: any LikeRepository

diff --git a/Projects/Domains/LikeDomain/Sources/UseCase/CancelLikeSongUseCaseImpl.swift b/Projects/Domains/LikeDomain/Sources/UseCase/CancelLikeSongUseCaseImpl.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import LikeDomainInterface
 import Foundation
+import LikeDomainInterface
 import RxSwift
 
 public struct CancelLikeSongUseCaseImpl: CancelLikeSongUseCase {

diff --git a/Projects/Domains/LikeDomain/Sources/UseCase/FetchLikeNumOfSongUseCaseImpl.swift b/Projects/Domains/LikeDomain/Sources/UseCase/FetchLikeNumOfSongUseCaseImpl.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import LikeDomainInterface
 import Foundation
+import LikeDomainInterface
 import RxSwift
 
 public struct FetchLikeNumOfSongUseCaseImpl: FetchLikeNumOfSongUseCase {

diff --git a/Projects/Domains/NoticeDomain/Sources/API/NoticeAPI.swift b/Projects/Domains/NoticeDomain/Sources/API/NoticeAPI.swift
@@ -6,11 +6,11 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import BaseDomain
+import ErrorModule
 import Foundation
 import Moya
-import BaseDomain
 import NoticeDomainInterface
-import ErrorModule
 
 public enum NoticeAPI {
     case fetchNotice(type: NoticeType)

diff --git a/Projects/Domains/NoticeDomain/Sources/DataSource/RemoteNoticeDataSourceImpl.swift b/Projects/Domains/NoticeDomain/Sources/DataSource/RemoteNoticeDataSourceImpl.swift
@@ -6,10 +6,10 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
-import Foundation
-import RxSwift
 import BaseDomain
+import Foundation
 import NoticeDomainInterface
+import RxSwift
 
 public final class RemoteNoticeDataSourceImpl: BaseRemoteDataSource<NoticeAPI>, RemoteNoticeDataSource {
     public func fetchNotice(type: NoticeType) -> Single<[FetchNoticeEntity]> {

diff --git a/Projects/Domains/NoticeDomain/Sources/Repository/NoticeRepositoryImpl.swift b/Projects/Domains/NoticeDomain/Sources/Repository/NoticeRepositoryImpl.swift
@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import RxSwift
 import NoticeDomainInterface
+import RxSwift
 
 public final class NoticeRepositoryImpl: NoticeRepository {
     private let remoteNoticeDataSource: any RemoteNoticeDataSource

diff --git a/Projects/Domains/NoticeDomain/Sources/UseCase/FetchNoticeCategoriesUseCaseImpl.swift b/Projects/Domains/NoticeDomain/Sources/UseCase/FetchNoticeCategoriesUseCaseImpl.swift
@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import RxSwift
 import NoticeDomainInterface
+import RxSwift
 
 public struct FetchNoticeCategoriesUseCaseImpl: FetchNoticeCategoriesUseCase {
     private let noticeRepository: any NoticeRepository

diff --git a/Projects/Domains/NoticeDomain/Sources/UseCase/FetchNoticeUseCaseImpl.swift b/Projects/Domains/NoticeDomain/Sources/UseCase/FetchNoticeUseCaseImpl.swift
@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import RxSwift
 import NoticeDomainInterface
+import RxSwift
 
 public struct FetchNoticeUseCaseImpl: FetchNoticeUseCase {
     private let noticeRepository: any NoticeRepository

diff --git a/...ist/Remote/RemotePlayListDataSource.swift → ...DataSource/RemotePlayListDataSource.swift b/...ist/Remote/RemotePlayListDataSource.swift → ...DataSource/RemotePlayListDataSource.swift
@@ -1,6 +1,4 @@
-import DataMappingModule
-import DomainModule
-import ErrorModule
+import BaseDomainInterface
 import Foundation
 import RxSwift
 
@@ -10,7 +8,6 @@ public protocol RemotePlayListDataSource {
     func createPlayList(title: String) -> Single<PlayListBaseEntity>
     func editPlayList(key: String, songs: [String]) -> Single<BaseEntity>
     func editPlayListName(key: String, title: String) -> Single<EditPlayListNameEntity>
-    func deletePlayList(key: String) -> Single<BaseEntity>
     func loadPlayList(key: String) -> Single<PlayListBaseEntity>
     func addSongIntoPlayList(key: String, songs: [String]) -> Single<AddSongEntity>
     func removeSongs(key: String, songs: [String]) -> Single<BaseEntity>

diff --git a/...urces/Playlist/Entity/AddSongEntity.swift → ...main/Interface/Entity/AddSongEntity.swift b/...urces/Playlist/Entity/AddSongEntity.swift → ...main/Interface/Entity/AddSongEntity.swift
diff --git a/...ylist/Entity/EditPlayListNameEntity.swift → ...rface/Entity/EditPlayListNameEntity.swift b/...ylist/Entity/EditPlayListNameEntity.swift → ...rface/Entity/EditPlayListNameEntity.swift
diff --git a/.../Playlist/Entity/PlayListBaseEntity.swift → ...Interface/Entity/PlayListBaseEntity.swift b/.../Playlist/Entity/PlayListBaseEntity.swift → ...Interface/Entity/PlayListBaseEntity.swift
diff --git a/...laylist/Entity/PlayListDetailEntity.swift → ...terface/Entity/PlayListDetailEntity.swift b/...laylist/Entity/PlayListDetailEntity.swift → ...terface/Entity/PlayListDetailEntity.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import SongsDomainInterface
 
 public struct PlayListDetailEntity: Equatable {
     public init(

diff --git a/...list/Entity/RecommendPlayListEntity.swift → ...face/Entity/RecommendPlayListEntity.swift b/...list/Entity/RecommendPlayListEntity.swift → ...face/Entity/RecommendPlayListEntity.swift
diff --git a/...ingModule/Sources/Base/PlayListType.swift → ...tDomain/Interface/Enum/PlayListType.swift b/...ingModule/Sources/Base/PlayListType.swift → ...tDomain/Interface/Enum/PlayListType.swift
diff --git a/...ylist/Repository/PlayListRepository.swift → ...rface/Repository/PlayListRepository.swift b/...ylist/Repository/PlayListRepository.swift → ...rface/Repository/PlayListRepository.swift
@@ -1,5 +1,4 @@
-import DataMappingModule
-import ErrorModule
+import BaseDomainInterface
 import Foundation
 import RxSwift
 
@@ -9,7 +8,6 @@ public protocol PlayListRepository {
     func createPlayList(title: String) -> Single<PlayListBaseEntity>
     func editPlayList(key: String, songs: [String]) -> Single<BaseEntity>
     func editPlayListName(key: String, title: String) -> Single<EditPlayListNameEntity>
-    func deletePlayList(key: String) -> Single<BaseEntity>
     func loadPlayList(key: String) -> Single<PlayListBaseEntity>
     func addSongIntoPlayList(key: String, songs: [String]) -> Single<AddSongEntity>
     func removeSongs(key: String, songs: [String]) -> Single<BaseEntity>

diff --git a/...UseCases/AddSongIntoPlayListUseCase.swift → .../UseCase/AddSongIntoPlayListUseCase.swift b/...UseCases/AddSongIntoPlayListUseCase.swift → .../UseCase/AddSongIntoPlayListUseCase.swift
@@ -1,4 +1,3 @@
-import DataMappingModule
 import Foundation
 import RxSwift