✨마이페이지 음악 리스트 필터링 기능 추가

StreetDrop/StreetDrop/Data/DataMapping/MyDropList/MyDropListResponseDTO+Mapping.swift

@@ -23,10 +23,11 @@ struct MyDropListResponseDTO: Decodable {
         let music: Music
         let content, createdAt: String
         let itemLikeCount: Int
+        let isLiked: Bool
 
         enum CodingKeys: String, CodingKey {
             case itemID = "itemId"
-            case location, user, music, content, createdAt, itemLikeCount
+            case location, user, music, content, createdAt, itemLikeCount, isLiked
         }
     }
 
@@ -76,7 +77,8 @@ extension MyDropListResponseDTO {
                             comment: value.content,
                             createdAt: value.createdAt,
                             location: value.location.address,
-                            likeCount: value.itemLikeCount
+                            likeCount: value.itemLikeCount,
+                            isLiked: value.isLiked
                         )
                     }
                 )

StreetDrop/StreetDrop/Data/DataMapping/MyLikeList/MyLikeListResponseDTO+Mapping.swift

@@ -76,7 +76,8 @@ extension MyLikeListResponseDTO {
                             comment: value.content,
                             createdAt: value.createdAt,
                             location: value.location.address,
-                            likeCount: value.itemLikeCount
+                            likeCount: value.itemLikeCount,
+                            isLiked: true
                         )
                     }
                 )

StreetDrop/StreetDrop/Data/Repositories/MyPage/DefaultMyPageRepository.swift

@@ -18,19 +18,19 @@ final class DefaultMyPageRepository {
 }
 
 extension DefaultMyPageRepository: MyPageRepository {
-    func fetchMyDropList() -> Single<TotalMyMusics> {
+    func fetchMyDropList(filterType: FilterType) -> Single<TotalMyMusics> {
         return networkManager.request(
-            target: .init(NetworkService.myDropList),
+            target: .init(NetworkService.myDropList(filterType: filterType.param)),
             responseType: MyDropListResponseDTO.self
         )
         .map { dto in
             return dto.toEntity()
         }
     }
 
-    func fetchMyLikeList() -> Single<TotalMyMusics> {
+    func fetchMyLikeList(filterType: FilterType) -> Single<TotalMyMusics> {
         return networkManager.request(
-            target: .init(NetworkService.myLikeList),
+            target: .init(NetworkService.myLikeList(filterType: filterType.param)),
             responseType: MyLikeListResponseDTO.self
         )
         .map { dto in

StreetDrop/StreetDrop/Data/Repositories/Protocol/MyPage/MyPageRepository.swift

@@ -10,8 +10,8 @@ import Foundation
 import RxSwift
 
 protocol MyPageRepository {
-    func fetchMyDropList() -> Single<TotalMyMusics>
-    func fetchMyLikeList() -> Single<TotalMyMusics>
+    func fetchMyDropList(filterType: FilterType) -> Single<TotalMyMusics>
+    func fetchMyLikeList(filterType: FilterType) -> Single<TotalMyMusics>
     func fetchMyLevel() -> Single<MyLevel>
     func fetchMyLevelProgress() -> Single<MyLevelProgress>
     func fetchLevelPolicy() -> Single<[LevelPolicy]>

StreetDrop/StreetDrop/Domain/Entity/ModalOption.swift

@@ -11,4 +11,5 @@ struct ModalOption {
     let icon: UIImage?
     let title: String
     let acton: UIAction
+    var isSelected: Bool = false
 }

StreetDrop/StreetDrop/Domain/UseCase/MusicDrop/DefaultMusicDropUseCase.swift → StreetDrop/StreetDrop/Domain/UseCase/DropMusic/DefaultDropMusicUseCase.swift

@@ -1,5 +1,5 @@
 //
-//  DefaultMusicDropUseCase.swift
+//  DefaultDropMusicUseCase.swift
 //  StreetDrop
 //
 //  Created by thoonk on 2023/09/17.
@@ -9,7 +9,7 @@ import Foundation
 
 import RxSwift
 
-final class DefaultMusicDropUseCase: MusicDropUseCase {
+final class DefaultDropMusicUseCase: DropMusicUseCase {
     private let dropMusicRepository: DropMusicRepository
 
     init(dropMusicRepository: DropMusicRepository = DefaultDropMusicRepository()) {

StreetDrop/StreetDrop/Domain/UseCase/MusicDrop/MusicDropUseCase.swift → StreetDrop/StreetDrop/Domain/UseCase/DropMusic/DropMusicUseCase.swift

@@ -1,5 +1,5 @@
 //
-//  MusicDropUseCase.swift
+//  DropMusicUseCase.swift
 //  StreetDrop
 //
 //  Created by thoonk on 2023/09/17.
@@ -9,6 +9,6 @@ import Foundation
 
 import RxSwift
 
-protocol MusicDropUseCase {
+protocol DropMusicUseCase {
     func drop(droppingInfo: DroppingInfo, content: String) -> Single<Int>
 }

StreetDrop/StreetDrop/Domain/UseCase/DefaultFetchingMusicWithinArea.swift → StreetDrop/StreetDrop/Domain/UseCase/FetchingMusicWithinArea/DefaultFetchingMusicWithinAreaUseCase.swift

@@ -1,5 +1,5 @@
 //
-//  DefaultFetchingMusicWithinArea.swift
+//  DefaultFetchingMusicWithinAreaUseCase.swift
 //  StreetDrop
 //
 //  Created by 차요셉 on 2023/09/22.
@@ -9,7 +9,7 @@ import Foundation
 
 import RxSwift
 
-final class DefaultFetchingMusicWithinArea: FetchingMusicWithinArea {
+final class DefaultFetchingMusicWithinAreaUseCase: FetchingMusicWithinAreaUseCase {
     private let mainRepository: MainRepository
 
     init(mainRepository: MainRepository = DefaultMainRepository(

StreetDrop/StreetDrop/Domain/UseCase/FetchingMusicWithinArea.swift → StreetDrop/StreetDrop/Domain/UseCase/FetchingMusicWithinArea/FetchingMusicWithinAreaUseCase.swift

@@ -9,6 +9,6 @@ import Foundation
 
 import RxSwift
 
-protocol FetchingMusicWithinArea {
+protocol FetchingMusicWithinAreaUseCase {
     func execute(lat: Double, lon: Double, distance: Double) -> Single<Musics>
 }

StreetDrop/StreetDrop/Domain/UseCase/FetchingMyDropList/DefaultFetchingMyDropListUseCase.swift

@@ -0,0 +1,24 @@
+//
+//  DefaultFetchingMyDropListUseCase.swift
+//  StreetDrop
+//
+//  Created by thoonk on 7/16/24.
+//
+
+import Foundation
+
+import RxSwift
+
+final class DefaultFetchingMyDropListUseCase {
+    private let repository: MyPageRepository
+
+    init(repository: MyPageRepository = DefaultMyPageRepository()) {
+        self.repository = repository
+    }
+}
+
+extension DefaultFetchingMyDropListUseCase: FetchingMyDropListUseCase {
+    func fetchMyDropList(filterType: FilterType) -> Single<TotalMyMusics> {
+        return repository.fetchMyDropList(filterType: filterType)
+    }
+}

StreetDrop/StreetDrop/Domain/UseCase/FetchingMyDropList/FetchingMyDropListUseCase.swift

@@ -0,0 +1,14 @@
+//
+//  FetchingMyDropListUseCase.swift
+//  StreetDrop
+//
+//  Created by thoonk on 7/16/24.
+//
+
+import Foundation
+
+import RxSwift
+
+protocol FetchingMyDropListUseCase {
+    func fetchMyDropList(filterType: FilterType) -> Single<TotalMyMusics>
+}

StreetDrop/StreetDrop/Domain/UseCase/FetchingMyLevel/DefaultFetchingMyLevelUseCase.swift

@@ -0,0 +1,28 @@
+//
+//  DefaultFetchingMyLevelUseCase.swift
+//  StreetDrop
+//
+//  Created by thoonk on 7/16/24.
+//
+
+import Foundation
+
+import RxSwift
+
+final class DefaultFetchingMyLevelUseCase {
+    private let repository: MyPageRepository
+
+    init(repository: MyPageRepository = DefaultMyPageRepository()) {
+        self.repository = repository
+    }
+}
+
+extension DefaultFetchingMyLevelUseCase: FetchingMyLevelUseCase {
+    func fetchMyLevel() -> Single<MyLevel> {
+        return repository.fetchMyLevel()
+    }
+
+    func fetchMyLevelProgress() -> Single<MyLevelProgress> {
+        return repository.fetchMyLevelProgress()
+    }
+}

StreetDrop/StreetDrop/Domain/UseCase/FetchingMyLevel/FetchingMyLevelUseCase.swift

@@ -0,0 +1,15 @@
+//
+//  FetchingMyLevelUseCase.swift
+//  StreetDrop
+//
+//  Created by thoonk on 7/16/24.
+//
+
+import Foundation
+
+import RxSwift
+
+protocol FetchingMyLevelUseCase {
+    func fetchMyLevel() -> Single<MyLevel>
+    func fetchMyLevelProgress() -> Single<MyLevelProgress>
+}

StreetDrop/StreetDrop/Domain/UseCase/FetchingMyLikeList/DefaultFetchingMyLikeListUseCase.swift

@@ -0,0 +1,24 @@
+//
+//  DefaultFetchingMyLikeListUseCase.swift
+//  StreetDrop
+//
+//  Created by thoonk on 7/16/24.
+//
+
+import Foundation
+
+import RxSwift
+
+final class DefaultFetchingMyLikeListUseCase {
+    private let repository: MyPageRepository
+
+    init(repository: MyPageRepository = DefaultMyPageRepository()) {
+        self.repository = repository
+    }
+}
+
+extension DefaultFetchingMyLikeListUseCase: FetchingMyLikeListUseCase {
+    func fetchMyLikeList(filterType: FilterType) -> Single<TotalMyMusics> {
+        return repository.fetchMyLikeList(filterType: filterType)
+    }
+}

StreetDrop/StreetDrop/Domain/UseCase/FetchingMyLikeList/FetchingMyLikeListUseCase.swift

@@ -0,0 +1,14 @@
+//
+//  FetchingMyLikeListUseCase.swift
+//  StreetDrop
+//
+//  Created by thoonk on 7/16/24.
+//
+
+import Foundation
+
+import RxSwift
+
+protocol FetchingMyLikeListUseCase {
+    func fetchMyLikeList(filterType: FilterType) -> Single<TotalMyMusics>
+}

StreetDrop/StreetDrop/Domain/UseCase/NoticeUseCase.swift → StreetDrop/StreetDrop/Domain/UseCase/FetchingNotice/NoticeUseCase.swift

@@ -9,12 +9,12 @@ import Foundation
 
 import RxSwift
 
-protocol NoticeUseCase {
+protocol FetchingNoticeUseCase {
     func fetchNoticeList() -> Single<[NoticeEntity]>
     func fetchNoticeDetail(id: Int) -> Single<NoticeDetailEntity>
 }
 
-final class DefaultNoticeUseCase: NoticeUseCase {
+final class DefaultFetchingNoticeUseCase: FetchingNoticeUseCase {
     private let noticeRepository: NoticeRepository
 
     init(noticeRepository: NoticeRepository = DefaultNoticeRepository()) {

StreetDrop/StreetDrop/Network/NetworkService.swift

@@ -28,8 +28,8 @@ enum NetworkService {
     case blockUser(blockUserID: Int)
     case postFCMToken(token: FCMTokenRequestDTO)
     case patchUsersMusicApp(musicAppQuery: String)
-    case myDropList
-    case myLikeList
+    case myDropList(filterType: String)
+    case myLikeList(filterType: String)
     case myLevel
     case myLevelProgress
     case levelPolicy
@@ -96,7 +96,7 @@ extension NetworkService: TargetType {
         case .patchUsersMusicApp:
             return "/users/music-app"
         case .myDropList:
-            return "/users/me/items/drop"
+            return "/v2/users/me/items/drop"
         case .myLikeList:
             return "/users/me/items/like"
         case .myLevel:
@@ -161,9 +161,11 @@ extension NetworkService: TargetType {
 
     var task: Moya.Task {
         switch self {
-        case .getMyInfo, .myDropList, .myLikeList, .myLevel, .myLevelProgress, .levelPolicy, .recommendMusic, .userCircleRadius, .getPopUpInfomation,
+        case .getMyInfo, .myLevel, .myLevelProgress, .levelPolicy, .recommendMusic, .userCircleRadius, .getPopUpInfomation,
                 .getNoticeList, .getNoticeDetail:
             return .requestPlain
+        case .myDropList(let filterType), .myLikeList(let filterType):
+            return .requestParameters(parameters: ["orderType": filterType], encoding: URLEncoding.default)
         case .searchMusic(let keyword):
             return .requestParameters(
                 parameters: ["keyword": keyword],

StreetDrop/StreetDrop/Presentation/CommunityView/View/CommunityViewController.swift

@@ -870,6 +870,7 @@ private extension CommunityViewController {
         )
 
         let modalView = OptionModalViewController(
+            type: .music,
             firstOption: shareOption,
             secondOption: claimOption,
             thirdOption: blockOption
@@ -924,6 +925,7 @@ private extension CommunityViewController {
         )
 
         let modalView = OptionModalViewController(
+            type: .music,
             firstOption: shareOption,
             secondOption: claimOption,
             thirdOption: blockOption

StreetDrop/StreetDrop/Presentation/MainScene/ViewModel/MainViewModel.swift

@@ -31,7 +31,7 @@ final class MainViewModel: ViewModel {
     private let myInfoUseCase: MyInfoUseCase
     private let fetchingPOIUseCase: FetchingPOIUseCase
     private let fetchingMusicCountUseCse: FetchingMusicCountUseCase
-    private let fetchingMusicWithinArea: FetchingMusicWithinArea
+    private let fetchingMusicWithinAreaUseCase: FetchingMusicWithinAreaUseCase
     private let fetchingPopUpInfomationUseCase: FetchingPopUpInfomationUseCase
     private let postingPopUpUserReadingUseCase: PostingPopUpUserReadingUseCase
 
@@ -43,7 +43,7 @@ final class MainViewModel: ViewModel {
         myInfoUseCase: MyInfoUseCase = DefaultMyInfoUseCase(),
         fetchingPOIUseCase: FetchingPOIUseCase = DefaultFetchingPOIUseCase(),
         fetchingMusicCountUseCse: FetchingMusicCountUseCase = DefaultFetchingMusicCountUseCase(),
-        fetchingMusicWithinArea: FetchingMusicWithinArea = DefaultFetchingMusicWithinArea(),
+        fetchingMusicWithinAreaUseCase: FetchingMusicWithinAreaUseCase = DefaultFetchingMusicWithinAreaUseCase(),
         fetchingSingleMusicUseCase: FetchingSingleMusicUseCase = DefaultFetchingSingleMusicUseCase(),
         fetchingPopUpInfomationUseCase: FetchingPopUpInfomationUseCase = DefaultFetchingPopUpInfomationUseCase(),
         postingPopUpUserReadingUseCase: PostingPopUpUserReadingUseCase = DefaultPostingPopUpUserReadingUseCase()
@@ -52,7 +52,7 @@ final class MainViewModel: ViewModel {
         self.myInfoUseCase = myInfoUseCase
         self.fetchingPOIUseCase = fetchingPOIUseCase
         self.fetchingMusicCountUseCse = fetchingMusicCountUseCse
-        self.fetchingMusicWithinArea = fetchingMusicWithinArea
+        self.fetchingMusicWithinAreaUseCase = fetchingMusicWithinAreaUseCase
         self.fetchingPopUpInfomationUseCase = fetchingPopUpInfomationUseCase
         self.postingPopUpUserReadingUseCase = postingPopUpUserReadingUseCase
         self.locationManager.delegate = self
@@ -237,7 +237,7 @@ private extension MainViewModel {
     }
 
     func fetchMusicWithArea(output: Output, disposedBag: DisposeBag) {
-        fetchingMusicWithinArea.execute(
+        fetchingMusicWithinAreaUseCase.execute(
             lat: self.location.coordinate.latitude,
             lon: self.location.coordinate.longitude,
             distance: userCircleRadius

StreetDrop/StreetDrop/Presentation/MusicDropView/ViewModel/MusicDropViewModel.swift

@@ -36,15 +36,15 @@ class MusicDropViewModel: ViewModel {
 
     var state: State = .drop
     private let droppingInfo: DroppingInfo
-    private let musicDropUseCase: MusicDropUseCase
+    private let dropMusicUseCase: DropMusicUseCase
     private let disposeBag: DisposeBag = DisposeBag()
 
     init (
         droppingInfo: DroppingInfo,
-        musicDropUseCase: MusicDropUseCase = DefaultMusicDropUseCase()
+        dropMusicUseCase: DropMusicUseCase = DefaultDropMusicUseCase()
     ) {
         self.droppingInfo = droppingInfo
-        self.musicDropUseCase = musicDropUseCase
+        self.dropMusicUseCase = dropMusicUseCase
     }
 
     func convert(input: Input, disposedBag: RxSwift.DisposeBag) -> Output {
@@ -93,7 +93,7 @@ class MusicDropViewModel: ViewModel {
                 var comment = ""
                 input.comment.bind { comment = $0 }.disposed(by: DisposeBag())
 
-                self.musicDropUseCase.drop(droppingInfo: self.droppingInfo, content: comment)
+                self.dropMusicUseCase.drop(droppingInfo: self.droppingInfo, content: comment)
                     .subscribe(onSuccess: { response in
                         if !(200...299).contains(response) {
                             output.isSuccessDrop.accept(