♻️ :: 좋아요 해결

wakmusic · Dec 9, 2023 · c93b588 · c93b588
1 parent 94b09e6
commit c93b588
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 10 deletions.
diff --git a/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel+API.swift b/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel+API.swift
@@ -55,6 +55,7 @@ extension PlayerViewModel {
             return
         }
         fetchFavoriteSongsUseCase.execute()
+            .debug("WWW")
             .catchAndReturn([])
             .map { $0.contains { $0.song.id == song.id } }
             .subscribe(onSuccess: { isLiked in

diff --git a/Projects/Services/APIKit/Sources/API/LikeAPI.swift b/Projects/Services/APIKit/Sources/API/LikeAPI.swift
@@ -20,18 +20,20 @@ extension LikeAPI: WMAPI {
         case .fetchLikeNumOfSong(id: let id):
             return "/\(id)"
         case .addLikeSong(id: let id):
-            return "/\(id)/addLike"
+            return "/\(id)"
         case .cancelLikeSong(id: let id):
-            return "/\(id)/removeLike"
+            return "/\(id)"
         }
     }
 
     public var method: Moya.Method {
         switch self {
         case .fetchLikeNumOfSong:
             return .get
-        case .addLikeSong,.cancelLikeSong:
+        case .addLikeSong:
             return .post
+        case .cancelLikeSong:
+            return .delete
         }
     }
 

diff --git a/Projects/Services/DataMappingModule/Sources/Like/Response/FetchLikeResponseDTO.swift b/Projects/Services/DataMappingModule/Sources/Like/Response/FetchLikeResponseDTO.swift
@@ -0,0 +1,14 @@
+//
+//  FetchLikeResponseDTO.swift
+//  DataMappingModule
+//
+//  Created by yongbeomkwak on 12/9/23.
+//  Copyright © 2023 yongbeomkwak. All rights reserved.
+//
+
+import Foundation
+
+public struct FetchLikeResponseDTO: Codable {
+    public let songId: String
+    public let like: Int
+}
diff --git a/Projects/Services/DataModule/Sources/Like/Repositories/LikeRepositoryImpl.swift b/Projects/Services/DataModule/Sources/Like/Repositories/LikeRepositoryImpl.swift
@@ -23,7 +23,7 @@ public struct LikeRepositoryImpl: LikeRepository {
         self.remoteLikeDataSource = remoteLikeDataSource
     }
 
-    public func fetchLikeNumOfSong(id: String) -> Single<FavoriteSongEntity> {
+    public func fetchLikeNumOfSong(id: String) -> Single<LikeEntity> {
         remoteLikeDataSource.fetchLikeNumOfSong(id: id)
     }
 

diff --git a/Projects/Services/DataModule/Sources/Like/UseCases/FetchLikeNumOfSongUseCaseImpl.swift b/Projects/Services/DataModule/Sources/Like/UseCases/FetchLikeNumOfSongUseCaseImpl.swift
@@ -24,7 +24,7 @@ public struct FetchLikeNumOfSongUseCaseImpl: FetchLikeNumOfSongUseCase {
         self.likeRepository = likeRepository
     }
 
-    public func execute(id: String) -> Single<FavoriteSongEntity> {
+    public func execute(id: String) -> Single<LikeEntity> {
         likeRepository.fetchLikeNumOfSong(id: id)
     }
 

diff --git a/Projects/Services/DomainModule/Sources/Like/Repository/LikeRepository.swift b/Projects/Services/DomainModule/Sources/Like/Repository/LikeRepository.swift
@@ -12,7 +12,7 @@ import DataMappingModule
 import ErrorModule
 
 public protocol LikeRepository {
-    func fetchLikeNumOfSong(id:String) -> Single<FavoriteSongEntity>
+    func fetchLikeNumOfSong(id:String) -> Single<LikeEntity>
     func addLikeSong(id:String) -> Single<LikeEntity>
     func cancelLikeSong(id:String) -> Single<LikeEntity>
 

diff --git a/Projects/Services/DomainModule/Sources/Like/UseCases/FetchLikeNumOfSongUseCase.swift b/Projects/Services/DomainModule/Sources/Like/UseCases/FetchLikeNumOfSongUseCase.swift
@@ -11,5 +11,5 @@ import RxSwift
 import DataMappingModule
 
 public protocol FetchLikeNumOfSongUseCase {
-    func execute(id:String) -> Single<FavoriteSongEntity>
+    func execute(id:String) -> Single<LikeEntity>
 }
diff --git a/Projects/Services/NetworkModule/Sources/Like/DataTransfer/FetchLikeTransfer.swift b/Projects/Services/NetworkModule/Sources/Like/DataTransfer/FetchLikeTransfer.swift
@@ -19,3 +19,9 @@ public extension LikeResponseDTO {
         )
     }
 }
+
+public extension FetchLikeResponseDTO {
+    func toDomain() -> LikeEntity {
+        LikeEntity(status: 200, likes: like)
+    }
+}
diff --git a/Projects/Services/NetworkModule/Sources/Like/Remote/RemoteLikeDataSource.swift b/Projects/Services/NetworkModule/Sources/Like/Remote/RemoteLikeDataSource.swift
@@ -13,7 +13,7 @@ import ErrorModule
 import DomainModule
 
 public protocol RemoteLikeDataSource {
-    func fetchLikeNumOfSong(id:String) -> Single<FavoriteSongEntity>
+    func fetchLikeNumOfSong(id:String) -> Single<LikeEntity>
     func addLikeSong(id:String) -> Single<LikeEntity>
     func cancelLikeSong(id:String) -> Single<LikeEntity>
 

diff --git a/Projects/Services/NetworkModule/Sources/Like/Remote/RemoteLikeDataSourceImpl.swift b/Projects/Services/NetworkModule/Sources/Like/Remote/RemoteLikeDataSourceImpl.swift
@@ -8,9 +8,9 @@ import Foundation
 
 public final class RemoteLikeDataSourceImpl: BaseRemoteDataSource<LikeAPI>, RemoteLikeDataSource {
 
-    public func fetchLikeNumOfSong(id: String) -> Single<FavoriteSongEntity> {
+    public func fetchLikeNumOfSong(id: String) -> Single<LikeEntity> {
         request(.fetchLikeNumOfSong(id: id))
-            .map(FavoriteSongsResponseDTO.self)
+            .map(FetchLikeResponseDTO.self)
             .map({$0.toDomain()})
     }