diff --git a/SodaLive/Sources/Content/ContentApi.swift b/SodaLive/Sources/Content/ContentApi.swift index 2f6cd79..9f2ccbe 100644 --- a/SodaLive/Sources/Content/ContentApi.swift +++ b/SodaLive/Sources/Content/ContentApi.swift @@ -9,7 +9,7 @@ import Foundation import Moya enum ContentApi { - case getAudioContentList(userId: Int, categoryId: Int, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sort: ContentListViewModel.Sort) + case getAudioContentList(userId: Int, categoryId: Int, isAdultContentVisible: Bool, page: Int, size: Int, sort: ContentListViewModel.Sort) case getAudioContentDetail(audioContentId: Int) case likeContent(request: PutAudioContentLikeRequest) case registerComment(request: RegisterAudioContentCommentRequest) @@ -257,12 +257,11 @@ extension ContentApi: TargetType { var task: Moya.Task { switch self { - case .getAudioContentList(let userId, let categoryId, let isAdultContentVisible, let contentType, let page, let size, let sort): + case .getAudioContentList(let userId, let categoryId, let isAdultContentVisible, let page, let size, let sort): let parameters = [ "creator-id": userId, "category-id": categoryId, "isAdultContentVisible": isAdultContentVisible, - "contentType": contentType, "page": page - 1, "size": size, "sort-type": sort diff --git a/SodaLive/Sources/Content/ContentRepository.swift b/SodaLive/Sources/Content/ContentRepository.swift index 7edd710..3854545 100644 --- a/SodaLive/Sources/Content/ContentRepository.swift +++ b/SodaLive/Sources/Content/ContentRepository.swift @@ -21,7 +21,6 @@ final class ContentRepository { userId: userId, categoryId: categoryId, isAdultContentVisible: UserDefaults.isAdultContentVisible(), - contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL, page: page, size: size, sort: sort) diff --git a/SodaLive/Sources/Content/Series/SeriesApi.swift b/SodaLive/Sources/Content/Series/SeriesApi.swift index 7ec7fc0..b5a2bcc 100644 --- a/SodaLive/Sources/Content/Series/SeriesApi.swift +++ b/SodaLive/Sources/Content/Series/SeriesApi.swift @@ -10,8 +10,8 @@ import Moya enum SeriesApi { case getSeriesList(creatorId: Int, sortType: SeriesListAllViewModel.SeriesSortType, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int) - case getSeriesDetail(seriesId: Int, isAdultContentVisible: Bool, contentType: ContentType) - case getSeriesContentList(seriesId: Int, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sortType: SeriesListAllViewModel.SeriesSortType) + case getSeriesDetail(seriesId: Int, isAdultContentVisible: Bool) + case getSeriesContentList(seriesId: Int, isAdultContentVisible: Bool, page: Int, size: Int, sortType: SeriesListAllViewModel.SeriesSortType) case getRecommendSeriesList(isAdultContentVisible: Bool, contentType: ContentType) } @@ -25,10 +25,10 @@ extension SeriesApi: TargetType { case .getSeriesList: return "/audio-content/series" - case .getSeriesDetail(let seriesId, _, _): + case .getSeriesDetail(let seriesId, _): return "/audio-content/series/\(seriesId)" - case .getSeriesContentList(let seriesId, _, _, _, _, _): + case .getSeriesContentList(let seriesId, _, _, _, _): return "/audio-content/series/\(seriesId)/content" case .getRecommendSeriesList: @@ -57,12 +57,8 @@ extension SeriesApi: TargetType { return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString) - case .getSeriesDetail(_, let isAdultContentVisible, let contentType): - let parameters = [ - "isAdultContentVisible": isAdultContentVisible, - "contentType": contentType - ] as [String : Any] - + case .getSeriesDetail(_, let isAdultContentVisible): + let parameters = ["isAdultContentVisible": isAdultContentVisible] as [String : Any] return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString) case .getRecommendSeriesList(let isAdultContentVisible, let contentType): @@ -73,10 +69,9 @@ extension SeriesApi: TargetType { return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString) - case .getSeriesContentList(_, let isAdultContentVisible, let contentType, let page, let size, let sortType): + case .getSeriesContentList(_, let isAdultContentVisible, let page, let size, let sortType): let parameters = [ "isAdultContentVisible": isAdultContentVisible, - "contentType": contentType, "page": page - 1, "size": size, "sortType": sortType diff --git a/SodaLive/Sources/Content/Series/SeriesRepository.swift b/SodaLive/Sources/Content/Series/SeriesRepository.swift index 53c1f4e..a25d144 100644 --- a/SodaLive/Sources/Content/Series/SeriesRepository.swift +++ b/SodaLive/Sources/Content/Series/SeriesRepository.swift @@ -30,8 +30,7 @@ class SeriesRepository { return api.requestPublisher( .getSeriesDetail( seriesId: seriesId, - isAdultContentVisible: UserDefaults.isAdultContentVisible(), - contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL + isAdultContentVisible: UserDefaults.isAdultContentVisible() ) ) } @@ -41,8 +40,7 @@ class SeriesRepository { .getSeriesContentList( seriesId: seriesId, isAdultContentVisible: UserDefaults.isAdultContentVisible(), - contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL, - page: page, + page: page, size: size, sortType: sortType )