구매목록

- orderType 파라미터 제거
This commit is contained in:
Yu Sung 2024-12-18 03:27:55 +09:00
parent bfcb5798bd
commit d483b59978
4 changed files with 9 additions and 13 deletions

View File

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

View File

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

View File

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

View File

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