Merge pull request #574 from wakmusic/561-develop-wakmuRecommendList

🔀 :: (#561) 왁뮤 추천 플레이리스트 화면을 만들어요.
wakmusic · Jun 10, 2024 · fe2272f · fe2272f
2 parents a0130f5 + 8ea0ee6
commit fe2272f
Show file tree

Hide file tree

Showing 28 changed files with 506 additions and 418 deletions.
diff --git a/Projects/Domains/BaseDomain/Project.swift b/Projects/Domains/BaseDomain/Project.swift
@@ -8,14 +8,14 @@ let project = Project.module(
         .interface(
             module: .domain(.BaseDomain),
             dependencies: [
-                .Project.Module.ThirdPartyLib
+                .Project.Module.ThirdPartyLib,
+                .Project.Module.ErrorModule,
             ]
         ),
         .implements(
             module: .domain(.BaseDomain),
             dependencies: [
                 .Project.Module.Utility,
-                .Project.Module.ErrorModule,
                 .Project.Module.KeychainModule,
                 .domain(target: .BaseDomain, type: .interface)
             ]

diff --git a/Projects/Domains/PlayListDomain/Interface/DataSource/RemotePlayListDataSource.swift b/Projects/Domains/PlayListDomain/Interface/DataSource/RemotePlayListDataSource.swift
@@ -11,6 +11,6 @@ public protocol RemotePlayListDataSource {
     func fetchPlaylistSongs(id: String) -> Single<[SongEntity]>
     func updatePlaylist(key: String, songs: [String]) -> Completable
     func addSongIntoPlayList(key: String, songs: [String]) -> Single<AddSongEntity>
-    func removeSongs(key: String, songs: [String]) -> Single<BaseEntity>
+    func removeSongs(key: String, songs: [String]) -> Completable
     func uploadImage(key: String, model: UploadImageType) -> Single<BaseImageEntity>
 }
diff --git a/Projects/Domains/PlayListDomain/Interface/Entity/AddSongEntity.swift b/Projects/Domains/PlayListDomain/Interface/Entity/AddSongEntity.swift
@@ -1,22 +1,14 @@
-//
-//  AddSongEntity.swift
-//  DomainModule
-//
-//  Created by yongbeomkwak on 2023/03/14.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 
 public struct AddSongEntity: Equatable {
     public init(
-        added_songs_length: Int,
+        addedSongCount: Int,
         duplicated: Bool
     ) {
-        self.added_songs_length = added_songs_length
+        self.addedSongCount = addedSongCount
         self.duplicated = duplicated
     }
 
-    public let added_songs_length: Int
+    public let addedSongCount: Int
     public let duplicated: Bool
 }
diff --git a/Projects/Domains/PlayListDomain/Interface/Entity/RecommendPlayListEntity.swift b/Projects/Domains/PlayListDomain/Interface/Entity/RecommendPlayListEntity.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct RecommendPlayListEntity: Equatable {
+public struct RecommendPlayListEntity: Hashable, Equatable {
     public init(
         key: String,
         title: String,
@@ -26,4 +26,13 @@ public struct RecommendPlayListEntity: Equatable {
     public let key, title, image: String
     public let `private`: Bool
     public let count: Int
+    private let id = UUID()
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+    }
+
+    public static func == (_ lhs: Self, _ rhs: Self) -> Bool {
+        lhs.id == rhs.id
+    }
 }
diff --git a/Projects/Domains/PlayListDomain/Interface/Repository/PlayListRepository.swift b/Projects/Domains/PlayListDomain/Interface/Repository/PlayListRepository.swift
@@ -11,6 +11,6 @@ public protocol PlayListRepository {
     func fetchPlaylistSongs(id: String) -> Single<[SongEntity]>
     func updatePlayList(key: String, songs: [String]) -> Completable
     func addSongIntoPlayList(key: String, songs: [String]) -> Single<AddSongEntity>
-    func removeSongs(key: String, songs: [String]) -> Single<BaseEntity>
+    func removeSongs(key: String, songs: [String]) -> Completable
     func uploadImage(key: String, model: UploadImageType) -> Single<BaseImageEntity>
 }
diff --git a/Projects/Domains/PlayListDomain/Interface/UseCase/RemoveSongsUseCase.swift b/Projects/Domains/PlayListDomain/Interface/UseCase/RemoveSongsUseCase.swift
@@ -3,5 +3,5 @@ import Foundation
 import RxSwift
 
 public protocol RemoveSongsUseCase {
-    func execute(key: String, songs: [String]) -> Single<BaseEntity>
+    func execute(key: String, songs: [String]) -> Completable
 }
diff --git a/Projects/Domains/PlayListDomain/Project.swift b/Projects/Domains/PlayListDomain/Project.swift
@@ -23,6 +23,9 @@ let project = Project.module(
         .tests(
             module: .domain(.PlayListDomain),
             dependencies: [.domain(target: .PlayListDomain)]
-        )
+        ),
+        .testing(module: .domain(.PlayListDomain), dependencies: [
+            .domain(target: .PlayListDomain, type: .interface)
+        ])
     ]
 )
diff --git a/Projects/Domains/PlayListDomain/Sources/API/PlayListAPI.swift b/Projects/Domains/PlayListDomain/Sources/API/PlayListAPI.swift
@@ -60,10 +60,7 @@ extension PlayListAPI: WMAPI {
             return "/create"
 
         case let .fetchPlaylistSongs(key: key), let .addSongIntoPlayList(key: key, _), let .updatePlaylist(key: key, _),
-             let .removeSongs(
-                 key: key,
-                 _
-             ):
+             let .removeSongs(key: key, _):
             return "/\(key)/songs"
 
         case let .uploadImage(key: key, _):
@@ -117,19 +114,17 @@ extension PlayListAPI: WMAPI {
             switch model {
             case let .default(imageName: data):
                 datas.append(MultipartFormData(
-                    provider: .data("default".data(using: .utf8)!),
-                    name: "type",
-                    fileName: "ㅅ"
+                    provider: .data("default".data(using: .utf8)!), name: "type"
                 ))
+
                 datas.append(MultipartFormData(provider: .data(data.data(using: .utf8)!), name: "imageName"))
 
             case let .custom(imageName: data):
                 datas.append(MultipartFormData(provider: .data("custom".data(using: .utf8)!), name: "type"))
                 datas.append(MultipartFormData(
                     provider: .data(data),
                     name: "imageFile",
-                    fileName: "image.jpeg",
-                    mimeType: "image/jpeg, image/jpg, image/png"
+                    fileName: "image.jpeg"
                 ))
             }
             return .uploadMultipart(datas)

diff --git a/Projects/Domains/PlayListDomain/Sources/DataSource/RemotePlayListDataSourceImpl.swift b/Projects/Domains/PlayListDomain/Sources/DataSource/RemotePlayListDataSourceImpl.swift
@@ -47,10 +47,9 @@ public final class RemotePlayListDataSourceImpl: BaseRemoteDataSource<PlayListAP
             .map { $0.toDomain() }
     }
 
-    public func removeSongs(key: String, songs: [String]) -> Single<BaseEntity> {
+    public func removeSongs(key: String, songs: [String]) -> Completable {
         request(.removeSongs(key: key, songs: songs))
-            .map(BaseResponseDTO.self)
-            .map { $0.toDomain() }
+            .asCompletable()
     }
 
     public func uploadImage(key: String, model: UploadImageType) -> Single<BaseImageEntity> {

diff --git a/Projects/Domains/PlayListDomain/Sources/Repository/PlaylistRepositoryImpl.swift b/Projects/Domains/PlayListDomain/Sources/Repository/PlaylistRepositoryImpl.swift
@@ -40,7 +40,7 @@ public final class PlayListRepositoryImpl: PlayListRepository {
         remotePlayListDataSource.addSongIntoPlayList(key: key, songs: songs)
     }
 
-    public func removeSongs(key: String, songs: [String]) -> RxSwift.Single<BaseEntity> {
+    public func removeSongs(key: String, songs: [String]) -> Completable {
         remotePlayListDataSource.removeSongs(key: key, songs: songs)
     }
 

diff --git a/Projects/Domains/PlayListDomain/Sources/ResponseDTO/AddSongResponseDTO.swift b/Projects/Domains/PlayListDomain/Sources/ResponseDTO/AddSongResponseDTO.swift
@@ -9,7 +9,7 @@ public struct AddSongResponseDTO: Decodable {
 public extension AddSongResponseDTO {
     func toDomain() -> AddSongEntity {
         AddSongEntity(
-            added_songs_length: addedSongCount,
+            addedSongCount: addedSongCount,
             duplicated: isDuplicatedSongsExist
         )
     }

diff --git a/Projects/Domains/PlayListDomain/Sources/UseCase/RemoveSongsUseCaseImpl.swift b/Projects/Domains/PlayListDomain/Sources/UseCase/RemoveSongsUseCaseImpl.swift
@@ -20,7 +20,7 @@ public struct RemoveSongsUseCaseImpl: RemoveSongsUseCase {
         self.playListRepository = playListRepository
     }
 
-    public func execute(key: String, songs: [String]) -> Single<BaseEntity> {
+    public func execute(key: String, songs: [String]) -> Completable {
         return playListRepository.removeSongs(key: key, songs: songs)
     }
 }
diff --git a/Projects/Domains/PlayListDomain/Testing/FetchPlayListUseCaseStub.swift b/Projects/Domains/PlayListDomain/Testing/FetchPlayListUseCaseStub.swift
@@ -0,0 +1,141 @@
+import PlayListDomainInterface
+import RxSwift
+
+final class FetchPlayListUseCaseStub: FetchRecommendPlayListUseCase {
+    var fetchData = [
+        RecommendPlayListEntity(
+            key: "best",
+            title: "베스트",
+            image: "https://cdn.wakmusic.xyz/playlist/best_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "carol",
+            title: "캐롤",
+            image: "https://cdn.wakmusic.xyz/playlist/carol_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "competition",
+            title: "경쟁",
+            image: "https://cdn.wakmusic.xyz/playlist/competition_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "best",
+            title: "베스트",
+            image: "https://cdn.wakmusic.xyz/playlist/best_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "carol",
+            title: "캐롤",
+            image: "https://cdn.wakmusic.xyz/playlist/carol_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "competition",
+            title: "경쟁",
+            image: "https://cdn.wakmusic.xyz/playlist/competition_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "best",
+            title: "베스트",
+            image: "https://cdn.wakmusic.xyz/playlist/best_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "carol",
+            title: "캐롤",
+            image: "https://cdn.wakmusic.xyz/playlist/carol_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "competition",
+            title: "경쟁",
+            image: "https://cdn.wakmusic.xyz/playlist/competition_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "best",
+            title: "베스트",
+            image: "https://cdn.wakmusic.xyz/playlist/best_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "carol",
+            title: "캐롤",
+            image: "https://cdn.wakmusic.xyz/playlist/carol_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "competition",
+            title: "경쟁",
+            image: "https://cdn.wakmusic.xyz/playlist/competition_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "best",
+            title: "베스트",
+            image: "https://cdn.wakmusic.xyz/playlist/best_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "carol",
+            title: "캐롤",
+            image: "https://cdn.wakmusic.xyz/playlist/carol_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "competition",
+            title: "경쟁",
+            image: "https://cdn.wakmusic.xyz/playlist/competition_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "best",
+            title: "베스트",
+            image: "https://cdn.wakmusic.xyz/playlist/best_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "carol",
+            title: "캐롤",
+            image: "https://cdn.wakmusic.xyz/playlist/carol_1.png",
+            private: false,
+            count: 0
+        ),
+        RecommendPlayListEntity(
+            key: "competition",
+            title: "경쟁",
+            image: "https://cdn.wakmusic.xyz/playlist/competition_1.png",
+            private: false,
+            count: 0
+        )
+    ]
+
+    func execute() -> Single<[RecommendPlayListEntity]> {
+        return Single.create { [fetchData] single in
+
+            single(.success(fetchData))
+            return Disposables.create()
+        }
+    }
+}
diff --git a/Projects/Features/BaseFeature/Sources/ViewModels/ContainSongsViewModel.swift b/Projects/Features/BaseFeature/Sources/ViewModels/ContainSongsViewModel.swift
@@ -103,10 +103,10 @@ public final class ContainSongsViewModel: ViewModelType {
                 if entity.duplicated {
                     return BaseEntity(
                         status: 200,
-                        description: "\(entity.added_songs_length)곡이 내 리스트에 담겼습니다. 중복 곡은 제외됩니다."
+                        description: "\(entity.addedSongCount)곡이 내 리스트에 담겼습니다. 중복 곡은 제외됩니다."
                     )
                 } else {
-                    return BaseEntity(status: 200, description: "\(entity.added_songs_length)곡이 내 리스트에 담겼습니다.")
+                    return BaseEntity(status: 200, description: "\(entity.addedSongCount)곡이 내 리스트에 담겼습니다.")
                 }
             }
             .bind(to: output.showToastMessage)