fix(api): 콘텐츠 설정 PATCH 제외 API 파라미터를 제거한다

SodaLive/Sources/Content/ContentApi.swift

@@ -9,7 +9,7 @@ import Foundation
 import Moya
 
 enum ContentApi {
-    case getAudioContentList(userId: Int, categoryId: Int, isAdultContentVisible: Bool, page: Int, size: Int, sort: ContentListViewModel.Sort)
+    case getAudioContentList(userId: Int, categoryId: Int, page: Int, size: Int, sort: ContentListViewModel.Sort)
     case getAudioContentDetail(audioContentId: Int)
     case likeContent(request: PutAudioContentLikeRequest)
     case registerComment(request: RegisterAudioContentCommentRequest)
@@ -25,51 +25,51 @@ enum ContentApi {
     case getNewContentUploadCreatorList
     case getMainBannerList
     case getMainOrderList
-    case getNewContentOfTheme(theme: String, isAdultContentVisible: Bool, contentType: ContentType)
-    case getCurationList(isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
+    case getNewContentOfTheme(theme: String)
+    case getCurationList(page: Int, size: Int)
     case donation(request: AudioContentDonationRequest)
     case modifyComment(request: ModifyCommentRequest)
-    case getNewContentThemeList(isAdultContentVisible: Bool, contentType: ContentType)
-    case getNewContentAllOfTheme(isFree: Bool, theme: String, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
-    case getAudioContentListByCurationId(curationId: Int, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sort: ContentCurationViewModel.Sort)
-    case getContentRanking(isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sortType: String)
+    case getNewContentThemeList
+    case getNewContentAllOfTheme(isFree: Bool, theme: String, page: Int, size: Int)
+    case getAudioContentListByCurationId(curationId: Int, page: Int, size: Int, sort: ContentCurationViewModel.Sort)
+    case getContentRanking(page: Int, size: Int, sortType: String)
     case getContentRankingSortType
     case pinContent(contentId: Int)
     case unpinContent(contentId: Int)
-    case getAudioContentByTheme(themeId: Int, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort)
+    case getAudioContentByTheme(themeId: Int, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort)
     case generateUrl(contentId: Int)
     
-    case getContentMainHome(isAdultContentVisible: Bool, contentType: ContentType)
-    case getPopularContentByCreator(creatorId: Int, isAdultContentVisible: Bool, contentType: ContentType)
-    case getContentMainHomeContentRanking(isAdultContentVisible: Bool, contentType: ContentType, sortType: String)
+    case getContentMainHome
+    case getPopularContentByCreator(creatorId: Int)
+    case getContentMainHomeContentRanking(sortType: String)
     
-    case getContentMainSeries(isAdultContentVisible: Bool, contentType: ContentType)
-    case getRecommendSeriesListByGenre(genreId: Int, isAdultContentVisible: Bool, contentType: ContentType)
-    case getRecommendSeriesByCreator(creatorId: Int, isAdultContentVisible: Bool, contentType: ContentType)
-    case getCompletedSeries(isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
+    case getContentMainSeries
+    case getRecommendSeriesListByGenre(genreId: Int)
+    case getRecommendSeriesByCreator(creatorId: Int)
+    case getCompletedSeries(page: Int, size: Int)
     
-    case getContentMainContent(isAdultContentVisible: Bool, contentType: ContentType)
-    case getContentMainNewContentOfTheme(theme: String, isAdultContentVisible: Bool, contentType: ContentType)
-    case getDailyContentRanking(sortType: String, isAdultContentVisible: Bool, contentType: ContentType)
-    case getRecommendContentByTag(tag: String, contentType: ContentType)
-    case getContentMainContentPopularContentByCreator(creatorId: Int, isAdultContentVisible: Bool, contentType: ContentType)
+    case getContentMainContent
+    case getContentMainNewContentOfTheme(theme: String)
+    case getDailyContentRanking(sortType: String)
+    case getRecommendContentByTag(tag: String)
+    case getContentMainContentPopularContentByCreator(creatorId: Int)
     
-    case getContentMainAlarm(isAdultContentVisible: Bool, contentType: ContentType)
-    case getContentMainAlarmAll(theme: String, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
+    case getContentMainAlarm
+    case getContentMainAlarmAll(theme: String, page: Int, size: Int)
     
-    case getContentMainAsmr(isAdultContentVisible: Bool, contentType: ContentType)
-    case getPopularAsmrContentByCreator(creatorId: Int, isAdultContentVisible: Bool, contentType: ContentType)
+    case getContentMainAsmr
+    case getPopularAsmrContentByCreator(creatorId: Int)
     
-    case getContentMainReplay(isAdultContentVisible: Bool, contentType: ContentType)
-    case getPopularReplayContentByCreator(creatorId: Int, isAdultContentVisible: Bool, contentType: ContentType)
+    case getContentMainReplay
+    case getPopularReplayContentByCreator(creatorId: Int)
     
-    case getContentMainFree(isAdultContentVisible: Bool, contentType: ContentType)
-    case getIntroduceCreatorList(isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
-    case getNewFreeContentOfTheme(theme: String, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
-    case getPopularFreeContentByCreator(creatorId: Int, isAdultContentVisible: Bool, contentType: ContentType)
+    case getContentMainFree
+    case getIntroduceCreatorList(page: Int, size: Int)
+    case getNewFreeContentOfTheme(theme: String, page: Int, size: Int)
+    case getPopularFreeContentByCreator(creatorId: Int)
     
-    case getAllAudioContents(isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, isFree: Bool?, isPointAvailableOnly: Bool?, sortType: ContentAllViewModel.Sort = .NEWEST, theme: String? = nil)
-    case getAudioContentActiveThemeList(isAdultContentVisible: Bool, contentType: ContentType, isFree: Bool?, isPointAvailableOnly: Bool?)
+    case getAllAudioContents(page: Int, size: Int, isFree: Bool?, isPointAvailableOnly: Bool?, sortType: ContentAllViewModel.Sort = .NEWEST, theme: String? = nil)
+    case getAudioContentActiveThemeList(isFree: Bool?, isPointAvailableOnly: Bool?)
 }
 
 extension ContentApi: TargetType {
@@ -145,7 +145,7 @@ extension ContentApi: TargetType {
         case .getNewContentAllOfTheme:
             return "/audio-content/main/new/all"
             
-        case .getAudioContentListByCurationId(let curationId, _, _, _, _, _):
+        case .getAudioContentListByCurationId(let curationId, _, _, _):
             return "/audio-content/curation/\(curationId)"
             
         case .getContentRanking:
@@ -160,7 +160,7 @@ extension ContentApi: TargetType {
         case .unpinContent(let contentId):
             return  "/audio-content/unpin-at-the-top/\(contentId)"
             
-        case .getAudioContentByTheme(let themeId, _, _, _, _, _):
+        case .getAudioContentByTheme(let themeId, _, _, _):
             return "/audio-content/theme/\(themeId)/content"
             
         case .generateUrl(let contentId):
@@ -273,11 +273,10 @@ extension ContentApi: TargetType {
     
     var task: Moya.Task {
         switch self {
-        case .getAudioContentList(let userId, let categoryId, let isAdultContentVisible, let page, let size, let sort):
+        case .getAudioContentList(let userId, let categoryId, let page, let size, let sort):
             let parameters = [
                 "creator-id": userId,
                 "category-id": categoryId,
-                "isAdultContentVisible": isAdultContentVisible,
                 "page": page - 1,
                 "size": size,
                 "sort-type": sort
@@ -339,11 +338,9 @@ extension ContentApi: TargetType {
         case .deleteAudioContent:
             return .requestPlain
             
-        case .getNewContentOfTheme(let theme, let isAdultContentVisible, let contentType):
+        case .getNewContentOfTheme(let theme):
             let parameters = [
-                "theme": theme,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
+                "theme": theme
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
@@ -354,30 +351,21 @@ extension ContentApi: TargetType {
         case .modifyComment(let request):
             return .requestJSONEncodable(request)
             
-        case .getNewContentThemeList(let isAdultContentVisible, let contentType):
-            let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
-            ] as [String : Any]
+        case .getNewContentThemeList:
+            return .requestPlain
             
-            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
-            
-        case .getNewContentAllOfTheme(let isFree, let theme, let isAdultContentVisible, let contentType, let page, let size):
+        case .getNewContentAllOfTheme(let isFree, let theme, let page, let size):
             let parameters = [
                 "isFree": isFree,
                 "theme": theme,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getAudioContentListByCurationId(_, let isAdultContentVisible, let contentType, let page, let size, let sort):
+        case .getAudioContentListByCurationId(_, let page, let size, let sort):
             let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size,
                 "sort-type": sort
@@ -385,10 +373,8 @@ extension ContentApi: TargetType {
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getContentRanking(let isAdultContentVisible, let contentType, let page, let size, let sortType):
+        case .getContentRanking(let page, let size, let sortType):
             let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size,
                 "sort-type": sortType
@@ -399,10 +385,8 @@ extension ContentApi: TargetType {
         case .getContentRankingSortType:
             return .requestPlain
             
-        case .getCurationList(let isAdultContentVisible, let contentType, let page, let size):
+        case .getCurationList(let page, let size):
             let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size
             ] as [String : Any]
@@ -412,10 +396,8 @@ extension ContentApi: TargetType {
         case .pinContent, .unpinContent:
             return .requestPlain
             
-        case .getAudioContentByTheme(_, let isAdultContentVisible, let contentType, let page, let size, let sort):
+        case .getAudioContentByTheme(_, let page, let size, let sort):
             let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size,
                 "sort-type": sort
@@ -423,141 +405,109 @@ extension ContentApi: TargetType {
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getContentMainHome(let isAdultContentVisible, let contentType),
-                .getContentMainSeries(let isAdultContentVisible, let contentType),
-                .getContentMainContent(let isAdultContentVisible, let contentType),
-                .getContentMainAlarm(let isAdultContentVisible, let contentType),
-                .getContentMainAsmr(let isAdultContentVisible, let contentType),
-                .getContentMainReplay(let isAdultContentVisible, let contentType),
-                .getContentMainFree(let isAdultContentVisible, let contentType):
+        case .getContentMainHome,
+                .getContentMainSeries,
+                .getContentMainContent,
+                .getContentMainAlarm,
+                .getContentMainAsmr,
+                .getContentMainReplay,
+                .getContentMainFree:
+            return .requestPlain
+            
+        case .getRecommendSeriesListByGenre(let genreId):
             let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
+                "genreId": genreId
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getRecommendSeriesListByGenre(let genreId, let isAdultContentVisible, let contentType):
+        case .getPopularContentByCreator(let creatorId):
             let parameters = [
-                "genreId": genreId,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
+                "creatorId": creatorId
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getPopularContentByCreator(let creatorId, let isAdultContentVisible, let contentType):
+        case .getContentMainHomeContentRanking(let sortType):
             let parameters = [
-                "creatorId": creatorId,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
+                "sort-type": sortType
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getContentMainHomeContentRanking(let isAdultContentVisible, let contentType, let sortType):
+        case .getRecommendSeriesByCreator(let creatorId):
             let parameters = [
-                "sort-type": sortType,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
+                "creatorId": creatorId
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getRecommendSeriesByCreator(let creatorId, let isAdultContentVisible, let contentType):
+        case .getContentMainNewContentOfTheme(let theme):
             let parameters = [
-                "creatorId": creatorId,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
+                "theme": theme
+            ] as [String : Any]
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
+            
+        case .getDailyContentRanking(let sortType):
+            let parameters = [
+                "sort-type": sortType
+            ] as [String : Any]
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
+            
+        case .getRecommendContentByTag(let tag):
+            let parameters = [
+                "tag": tag
+            ] as [String : Any]
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
+            
+        case .getContentMainContentPopularContentByCreator(let creatorId):
+            let parameters = [
+                "creatorId": creatorId
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getContentMainNewContentOfTheme(let theme, let isAdultContentVisible, let contentType):
+        case .getNewFreeContentOfTheme(let theme, let page, let size):
             let parameters = [
                 "theme": theme,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
+                "page": page - 1,
+                "size": size
             ] as [String : Any]
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getDailyContentRanking(let sortType, let isAdultContentVisible, let contentType):
-            let parameters = [
-                "sort-type": sortType,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
-            ] as [String : Any]
-            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
-            
-        case .getRecommendContentByTag(let tag, let contentType):
-            let parameters = [
-                "tag": tag,
-                "contentType": contentType
-            ] as [String : Any]
-            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
-            
-        case .getContentMainContentPopularContentByCreator(let creatorId, let isAdultContentVisible, let contentType):
-            let parameters = [
-                "creatorId": creatorId,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
-            ] as [String : Any]
-            
-            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
-            
-        case .getNewFreeContentOfTheme(let theme, let isAdultContentVisible, let contentType, let page, let size):
+        case .getContentMainAlarmAll(let theme, let page, let size):
             let parameters = [
                 "theme": theme,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size
             ] as [String : Any]
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getContentMainAlarmAll(let theme, let isAdultContentVisible, let contentType, let page, let size):
+        case .getIntroduceCreatorList(let page, let size):
             let parameters = [
-                "theme": theme,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size
             ] as [String : Any]
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getIntroduceCreatorList(let isAdultContentVisible, let contentType, let page, let size):
+        case .getPopularAsmrContentByCreator(let creatorId),
+                .getPopularReplayContentByCreator(let creatorId),
+                .getPopularFreeContentByCreator(let creatorId):
             let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
-                "page": page - 1,
-                "size": size
+                "creatorId": creatorId
             ] as [String : Any]
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getPopularAsmrContentByCreator(let creatorId, let isAdultContentVisible, let contentType),
-                .getPopularReplayContentByCreator(let creatorId, let isAdultContentVisible, let contentType),
-                .getPopularFreeContentByCreator(let creatorId, let isAdultContentVisible, let contentType):
+        case .getCompletedSeries(let page, let size):
             let parameters = [
-                "creatorId": creatorId,
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType
-            ] as [String : Any]
-            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
-            
-        case .getCompletedSeries(let isAdultContentVisible, let contentType, let page, let size):
-            let parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "page": page - 1,
                 "size": size
             ] as [String : Any]
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getAllAudioContents(let isAdultContentVisible, let contentType, let page, let size, let isFree, let isPointAvailableOnly, let sortType, let theme):
+        case .getAllAudioContents(let page, let size, let isFree, let isPointAvailableOnly, let sortType, let theme):
             var parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
                 "sort-type": sortType,
                 "page": page - 1,
                 "size": size
@@ -577,11 +527,8 @@ extension ContentApi: TargetType {
             
             return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
             
-        case .getAudioContentActiveThemeList(let isAdultContentVisible, let contentType, let isFree, let isPointAvailableOnly):
-            var parameters = [
-                "isAdultContentVisible": isAdultContentVisible,
-                "contentType": contentType,
-            ] as [String : Any]
+        case .getAudioContentActiveThemeList(let isFree, let isPointAvailableOnly):
+            var parameters = [String : Any]()
             
             if let isFree = isFree {
                 parameters["isFree"] = isFree