wakmusic · KangTaeHoon · May 15, 2024 · May 13, 2024 · May 13, 2024 · May 13, 2024
@@ -28,12 +28,6 @@ public extension AppComponent {
         }
     }
 
-    var fetchSearchSongUseCase: any FetchSearchSongUseCase {
-        shared {
-            FetchSearchSongUseCaseImpl(songsRepository: songsRepository)
-        }
-    }
-
     var fetchLyricsUseCase: any FetchLyricsUseCase {
         shared {
             FetchLyricsUseCaseImpl(songsRepository: songsRepository)

@@ -10,46 +10,39 @@ import Foundation
 
 public struct ArtistListEntity: Equatable {
     public init(
-        artistId: String,
-        name: String,
-        short: String,
-        group: String,
+        id: String,
+        krName: String,
+        enName: String,
+        groupName: String,
         title: String,
         description: String,
-        color: [[String]],
-        youtube: String,
-        twitch: String,
-        instagram: String,
-        imageRoundVersion: Int,
-        imageSquareVersion: Int,
+        personalColor: String,
+        roundImage: String,
+        squareImage: String,
         graduated: Bool,
         isHiddenItem: Bool
     ) {
-        self.artistId = artistId
-        self.name = name
-        self.short = short
-        self.group = group
+        self.id = id
+        self.krName = krName
+        self.enName = enName
+        self.groupName = groupName
         self.title = title
         self.description = description
-        self.color = color
-        self.youtube = youtube
-        self.twitch = twitch
-        self.instagram = instagram
-        self.imageRoundVersion = imageRoundVersion
-        self.imageSquareVersion = imageSquareVersion
+        self.personalColor = personalColor
+        self.roundImage = roundImage
+        self.squareImage = squareImage
         self.graduated = graduated
         self.isHiddenItem = isHiddenItem
     }
 
     public static func == (lhs: Self, rhs: Self) -> Bool {
-        return lhs.artistId == rhs.artistId
+        return lhs.id == rhs.id
     }
 
-    public let artistId, name, short, group: String
+    public let id, krName, enName, groupName: String
     public let title, description: String
-    public let color: [[String]]
-    public let youtube, twitch, instagram: String
-    public let imageRoundVersion, imageSquareVersion: Int
+    public let personalColor: String
+    public let roundImage, squareImage: String
     public let graduated: Bool
     public var isHiddenItem: Bool = false
 }
@@ -10,32 +10,23 @@ import Foundation
 
 public struct ArtistSongListEntity: Equatable {
     public init(
-        songId: String,
+        songID: String,
         title: String,
         artist: String,
-        remix: String,
-        reaction: String,
         date: String,
-        views: Int,
-        last: Int,
         isSelected: Bool
     ) {
-        self.songId = songId
+        self.songID = songID
         self.title = title
         self.artist = artist
-        self.remix = remix
-        self.reaction = reaction
         self.date = date
-        self.views = views
-        self.last = last
         self.isSelected = isSelected
     }
 
     public static func == (lhs: Self, rhs: Self) -> Bool {
-        return lhs.songId == rhs.songId
+        return lhs.songID == rhs.songID
     }
 
-    public let songId, title, artist, remix, reaction, date: String
-    public let views, last: Int
+    public let songID, title, artist, date: String
     public var isSelected: Bool = false
 }
@@ -8,8 +8,8 @@
 
 import Foundation
 
-public enum ArtistSongSortType: String {
-    case new
+public enum ArtistSongSortType: Int {
+    case new = 1
     case popular
     case old
 

@@ -29,9 +29,9 @@ extension ArtistAPI: WMAPI {
     public var urlPath: String {
         switch self {
         case .fetchArtistList:
-            return ""
-        case .fetchArtistSongList:
-            return "/albums"
+            return "/list"
+        case let .fetchArtistSongList(id, _, _):
+            return "/\(id)/songs"
         }
     }
 
@@ -47,12 +47,11 @@ extension ArtistAPI: WMAPI {
         switch self {
         case .fetchArtistList:
             return .requestPlain
-        case let .fetchArtistSongList(id, sort, page):
+        case let .fetchArtistSongList(_, sort, page):
             return .requestParameters(
                 parameters: [
-                    "id": id,
-                    "sort": sort.rawValue,
-                    "start": (page == 1) ? 0 : (page - 1) * 30
+                    "type": sort.rawValue,
+                    "page": page
                 ],
                 encoding: URLEncoding.queryString
             )

@@ -10,72 +10,77 @@ import ArtistDomainInterface
 import Foundation
 
 public struct ArtistListResponseDTO: Decodable, Equatable {
-    public let artistId, name, short: String
-    public let description: String
-    public let title: ArtistListResponseDTO.Title?
-    public let color: ArtistListResponseDTO.Color?
-    public let youtube, twitch, instagram: String?
-    public let graduated: Bool?
-    public let group: ArtistListResponseDTO.Group?
-    public let image: ArtistListResponseDTO.Image?
+    let name: ArtistListResponseDTO.Name
+    let group: ArtistListResponseDTO.Group
+    let info: ArtistListResponseDTO.Info
+    let imageURL: ArtistListResponseDTO.ImageURL
+    let graduated: Bool
 
     public static func == (lhs: Self, rhs: Self) -> Bool {
-        return lhs.artistId == rhs.artistId
+        return lhs.name.id == rhs.name.id
     }
 
     private enum CodingKeys: String, CodingKey {
-        case artistId
-        case title
-        case group, image
-        case name, short, description
-        case color, youtube, twitch, instagram
+        case name
+        case group
+        case info
+        case imageURL = "imageUrl"
         case graduated
     }
 }
 
 public extension ArtistListResponseDTO {
-    struct Group: Codable {
-        public let engName: String
-        public let korName: String
+    struct Name: Decodable {
+        let id: String
+        let krName: String
+        let enName: String
 
         private enum CodingKeys: String, CodingKey {
-            case engName = "en"
-            case korName = "kr"
+            case id = "kr"
+            case krName = "krShort"
+            case enName = "en"
         }
     }
 
-    struct Image: Codable {
-        public let round: Int
-        public let square: Int
+    struct Group: Decodable {
+        let name: String
     }
 
-    // MARK: - Color
-    struct Color: Codable {
-        public let background: [[String]]
+    struct Info: Decodable {
+        let title: ArtistListResponseDTO.Info.Title
+        let description: String
+        let color: ArtistListResponseDTO.Info.Color
     }
 
-    // MARK: - Title
-    struct Title: Codable {
-        public let app: String
+    struct ImageURL: Decodable {
+        let round: String
+        let square: String
+    }
+}
+
+public extension ArtistListResponseDTO.Info {
+    struct Title: Decodable {
+        let short: String
+    }
+
+    struct Color: Decodable {
+        let background: [[String]]
     }
 }
 
 public extension ArtistListResponseDTO {
     func toDomain() -> ArtistListEntity {
         ArtistListEntity(
-            artistId: artistId,
-            name: name,
-            short: short,
-            group: group?.korName ?? "",
-            title: title?.app ?? "",
-            description: description,
-            color: color?.background ?? [],
-            youtube: youtube ?? "",
-            twitch: twitch ?? "",
-            instagram: instagram ?? "",
-            imageRoundVersion: image?.round ?? 0,
-            imageSquareVersion: image?.square ?? 0,
-            graduated: graduated ?? false,
+            id: name.id,
+            krName: name.krName,
+            enName: name.enName,
+            groupName: group.name,
+            title: info.title.short,
+            description: info.description,
+            personalColor: info.color.background.flatMap { $0 }.first ?? "ffffff",
+            roundImage: imageURL.round,
+            squareImage: imageURL.square,
+            graduated: graduated,
             isHiddenItem: false
         )
     }

@@ -11,39 +11,27 @@ import Foundation
 import Utility
 
 public struct ArtistSongListResponseDTO: Decodable, Equatable {
-    public let songId, title, artist, remix: String
-    public let reaction: String
-    public let date: Int
-    public let total: ArtistSongListResponseDTO.Total?
+    let songID, title: String
+    let artists: [String]
+    let date: Int
 
     public static func == (lhs: Self, rhs: Self) -> Bool {
-        return lhs.songId == rhs.songId
+        return lhs.songID == rhs.songID
     }
 
     enum CodingKeys: String, CodingKey {
-        case songId
-        case title, artist, remix, reaction, date, total
-    }
-}
-
-public extension ArtistSongListResponseDTO {
-    struct Total: Codable {
-        public let views: Int
-        public let last: Int
+        case songID = "videoId"
+        case title, artists, date
     }
 }
 
 public extension ArtistSongListResponseDTO {
     func toDomain() -> ArtistSongListEntity {
         ArtistSongListEntity(
-            songId: songId,
+            songID: songID,
             title: title,
-            artist: artist,
-            remix: remix,
-            reaction: reaction,
+            artist: artists.joined(separator: ", "),
             date: date.changeDateFormat(origin: "yyMMdd", result: "yyyy.MM.dd"),
-            views: total?.views ?? 0,
-            last: total?.last ?? 0,
             isSelected: false
         )
     }

@@ -2,6 +2,6 @@ import Foundation
 import RxSwift
 
 public protocol RemoteChartDataSource {
-    func fetchChartRanking(type: ChartDateType, limit: Int) -> Single<[ChartRankingEntity]>
+    func fetchChartRanking(type: ChartDateType) -> Single<[ChartRankingEntity]>
     func fetchChartUpdateTime(type: ChartDateType) -> Single<String>
 }
@@ -5,8 +5,6 @@ public struct ChartRankingEntity: Equatable {
         id: String,
         title: String,
         artist: String,
-        remix: String,
-        reaction: String,
         views: Int,
         last: Int,
         increase: Int,
@@ -16,17 +14,14 @@ public struct ChartRankingEntity: Equatable {
         self.id = id
         self.title = title
         self.artist = artist
-        self.remix = remix
-        self.reaction = reaction
         self.views = views
         self.last = last
         self.increase = increase
         self.date = date
         self.isSelected = isSelected
     }
 
-    public let id, title, artist, remix: String
-    public let reaction: String
+    public let id, title, artist: String
     public let views, last, increase: Int
     public let date: String
     public var isSelected: Bool

@@ -1,22 +1,22 @@
 import Foundation
 
 public enum ChartDateType: String {
-    case monthly
-    case weekly
-    case daily
     case hourly
+    case daily
+    case weekly
+    case monthly
     case total
 
     public var display: String {
         switch self {
-        case .monthly:
-            return "월간순"
-        case .weekly:
-            return "주간순"
-        case .daily:
-            return "일간순"
         case .hourly:
             return "시간순"
+        case .daily:
+            return "일간순"
+        case .weekly:
+            return "주간순"
+        case .monthly:
+            return "월간순"
         case .total:
             return "누적순"
         }

@@ -2,6 +2,6 @@ import Foundation
 import RxSwift
 
 public protocol ChartRepository {
-    func fetchChartRanking(type: ChartDateType, limit: Int) -> Single<[ChartRankingEntity]>
+    func fetchChartRanking(type: ChartDateType) -> Single<[ChartRankingEntity]>
     func fetchChartUpdateTime(type: ChartDateType) -> Single<String>
 }