fix(api): 콘텐츠 설정 PATCH 제외 API 파라미터를 제거한다
This commit is contained in:
@@ -9,10 +9,10 @@ import Foundation
|
||||
import Moya
|
||||
|
||||
enum SearchApi {
|
||||
case searchUnified(keyword: String, isAdultContentVisible: Bool, contentType: ContentType)
|
||||
case searchCreatorList(keyword: String, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
|
||||
case searchContentList(keyword: String, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
|
||||
case searchSeriesList(keyword: String, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
|
||||
case searchUnified(keyword: String)
|
||||
case searchCreatorList(keyword: String, page: Int, size: Int)
|
||||
case searchContentList(keyword: String, page: Int, size: Int)
|
||||
case searchSeriesList(keyword: String, page: Int, size: Int)
|
||||
}
|
||||
|
||||
extension SearchApi: TargetType {
|
||||
@@ -42,42 +42,34 @@ extension SearchApi: TargetType {
|
||||
|
||||
var task: Moya.Task {
|
||||
switch self {
|
||||
case .searchUnified(let keyword, let isAdultContentVisible, let contentType):
|
||||
case .searchUnified(let keyword):
|
||||
let parameters = [
|
||||
"keyword": keyword,
|
||||
"isAdultContentVisible": isAdultContentVisible,
|
||||
"contentType": contentType
|
||||
"keyword": keyword
|
||||
] as [String : Any]
|
||||
|
||||
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
|
||||
|
||||
case .searchCreatorList(let keyword, let isAdultContentVisible, let contentType, let page, let size):
|
||||
case .searchCreatorList(let keyword, let page, let size):
|
||||
let parameters = [
|
||||
"keyword": keyword,
|
||||
"isAdultContentVisible": isAdultContentVisible,
|
||||
"contentType": contentType,
|
||||
"page": page - 1,
|
||||
"size": size
|
||||
] as [String : Any]
|
||||
|
||||
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
|
||||
|
||||
case .searchContentList(let keyword, let isAdultContentVisible, let contentType, let page, let size):
|
||||
case .searchContentList(let keyword, let page, let size):
|
||||
let parameters = [
|
||||
"keyword": keyword,
|
||||
"isAdultContentVisible": isAdultContentVisible,
|
||||
"contentType": contentType,
|
||||
"page": page - 1,
|
||||
"size": size
|
||||
] as [String : Any]
|
||||
|
||||
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
|
||||
|
||||
case .searchSeriesList(let keyword, let isAdultContentVisible, let contentType, let page, let size):
|
||||
case .searchSeriesList(let keyword, let page, let size):
|
||||
let parameters = [
|
||||
"keyword": keyword,
|
||||
"isAdultContentVisible": isAdultContentVisible,
|
||||
"contentType": contentType,
|
||||
"page": page - 1,
|
||||
"size": size
|
||||
] as [String : Any]
|
||||
|
||||
@@ -14,21 +14,13 @@ final class SearchRepository {
|
||||
private let api = MoyaProvider<SearchApi>()
|
||||
|
||||
func searchUnified(keyword: String) -> AnyPublisher<Response, MoyaError> {
|
||||
return api.requestPublisher(
|
||||
.searchUnified(
|
||||
keyword: keyword,
|
||||
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
|
||||
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL
|
||||
)
|
||||
)
|
||||
return api.requestPublisher(.searchUnified(keyword: keyword))
|
||||
}
|
||||
|
||||
func searchCreatorList(keyword: String, page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
|
||||
return api.requestPublisher(
|
||||
.searchCreatorList(
|
||||
keyword: keyword,
|
||||
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
|
||||
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL,
|
||||
page: page,
|
||||
size: size
|
||||
)
|
||||
@@ -39,8 +31,6 @@ final class SearchRepository {
|
||||
return api.requestPublisher(
|
||||
.searchContentList(
|
||||
keyword: keyword,
|
||||
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
|
||||
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL,
|
||||
page: page,
|
||||
size: size
|
||||
)
|
||||
@@ -51,8 +41,6 @@ final class SearchRepository {
|
||||
return api.requestPublisher(
|
||||
.searchSeriesList(
|
||||
keyword: keyword,
|
||||
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
|
||||
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL,
|
||||
page: page,
|
||||
size: size
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user