구매목록

- orderType 파라미터 제거

SodaLive/Sources/Content/ContentApi.swift

@@ -14,7 +14,7 @@ enum ContentApi {
     case likeContent(request: PutAudioContentLikeRequest)
     case registerComment(request: RegisterAudioContentCommentRequest)
     case orderAudioContent(request: OrderRequest)
-    case getOrderList(orderType: OrderType?, page: Int, size: Int)
+    case getOrderList(page: Int, size: Int)
     case addAllPlaybackTracking(request: AddAllPlaybackTrackingRequest)
     case getAudioContentThemeList
     case uploadAudioContent(parameters: [MultipartFormData])
@@ -184,16 +184,12 @@ extension ContentApi: TargetType {
         case .orderAudioContent(let request):
             return .requestJSONEncodable(request)
             
-        case .getOrderList(let orderType, let page, let size):
-            var parameters = [
+        case .getOrderList(let page, let size):
+            let parameters = [
                 "page": page - 1,
                 "size": size
             ] as [String : Any]
             
-            if let orderType = orderType {
-                parameters["orderType"] = orderType
-            }
-            
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
         case .addAllPlaybackTracking(let request):

SodaLive/Sources/Content/ContentRepository.swift

@@ -34,8 +34,8 @@ final class ContentRepository {
         return api.requestPublisher(.orderAudioContent(request: OrderRequest(contentId: contentId, orderType: orderType)))
     }
     
-    func getOrderList(orderType: OrderType?, page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
-        return api.requestPublisher(.getOrderList(orderType: orderType, page: page, size: size))
+    func getOrderList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getOrderList(page: page, size: size))
     }
     
     func addAllPlaybackTracking(request: AddAllPlaybackTrackingRequest) -> AnyPublisher<Response, MoyaError> {

SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift

@@ -83,14 +83,14 @@ struct PlaylistAddContentView: View {
                         .padding(.top, 6.7)
                         .onAppear {
                             if index == viewModel.orderList.count - 1 {
-                                viewModel.getOrderList(orderType: .KEEP)
+                                viewModel.getOrderList()
                             }
                         }
                     }
                 }
             }
             .onAppear {
-                viewModel.getOrderList(orderType: .KEEP)
+                viewModel.getOrderList()
             }
         }
         .padding(.horizontal, 13.3)

SodaLive/Sources/MyPage/OrderList/OrderListAllViewModel.swift

@@ -25,11 +25,11 @@ final class OrderListAllViewModel: ObservableObject {
     var isLast = false
     private let pageSize = 10
     
-    func getOrderList(orderType: OrderType? = nil) {
+    func getOrderList() {
         if (!isLast && !isLoading) {
             isLoading = true
             
-            repository.getOrderList(orderType: orderType, page: page, size: pageSize)
+            repository.getOrderList(page: page, size: pageSize)
                 .sink { result in
                     switch result {
                     case .finished: