시리즈 상세, 시리즈 전체회차 듣기, 콘텐츠 전체보기

- contentType을 제거하여 해당 뷰에 진입을 하면 콘텐츠가 항상 보이도록 수정

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

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)

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 getSeriesDetail(seriesId: Int, isAdultContentVisible: Bool)
-    case getSeriesContentList(seriesId: Int, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sortType: SeriesListAllViewModel.SeriesSortType)
+    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):
+        case .getSeriesDetail(_, let isAdultContentVisible):
-            let parameters = [
+            let parameters = ["isAdultContentVisible": isAdultContentVisible] as [String : Any]
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
-            ] 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

SodaLive/Sources/Content/Series/SeriesRepository.swift

@@ -30,8 +30,7 @@ class SeriesRepository {
         return api.requestPublisher(
             .getSeriesDetail(
                 seriesId: seriesId,
-                isAdultContentVisible: UserDefaults.isAdultContentVisible(),
+                isAdultContentVisible: UserDefaults.isAdultContentVisible()
-                contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL
             )
         )
     }
@@ -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
             )