klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

콘텐츠 메인 - 추천시리즈, 모닝콜, 숏플, 라이브 다시보기

Browse Source 
- 남성향이면 여성 크리에이터, 여성향이면 남성 크리에이터 작품만 조회되도록 수정
This commit is contained in:
Yu Sung
2024-10-14 01:34:58 +09:00
parent d53b45ac19
commit 5532b1bdcc
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SodaLive/Sources/Content/ContentApi.swift
View File

@@ -36,7 +36,7 @@ enum ContentApi {
case getContentRankingSortType case getContentRankingSortType
case pinContent(contentId: Int) case pinContent(contentId: Int)
case unpinContent(contentId: Int) case unpinContent(contentId: Int)
case getAudioContentByTheme(themeId: Int, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort) case getAudioContentByTheme(themeId: Int, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort)
} }
extension ContentApi: TargetType { extension ContentApi: TargetType {
@@ -127,7 +127,7 @@ extension ContentApi: TargetType {
case .unpinContent(let contentId): case .unpinContent(let contentId):
return "/audio-content/unpin-at-the-top/\(contentId)" return "/audio-content/unpin-at-the-top/\(contentId)"
case .getAudioContentByTheme(let themeId, _, _, _): case .getAudioContentByTheme(let themeId, _, _, _, _, _):
return "/audio-content/theme/\(themeId)/content" return "/audio-content/theme/\(themeId)/content"
} }
} }
@@ -284,8 +284,10 @@ extension ContentApi: TargetType {
case .pinContent, .unpinContent: case .pinContent, .unpinContent:
return .requestPlain return .requestPlain
case .getAudioContentByTheme(_, let page, let size, let sort): case .getAudioContentByTheme(_, let isAdultContentVisible, let contentType, let page, let size, let sort):
let parameters = [ let parameters = [
"isAdultContentVisible": isAdultContentVisible,
"contentType": contentType,
"page": page - 1, "page": page - 1,
"size": size, "size": size,
"sort-type": sort "sort-type": sort

11
SodaLive/Sources/Content/ContentRepository.swift
View File

@@ -148,6 +148,15 @@ final class ContentRepository {
} }
func getAudioContentByTheme(themeId: Int, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort) -> AnyPublisher<Response, MoyaError> { func getAudioContentByTheme(themeId: Int, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort) -> AnyPublisher<Response, MoyaError> {
return api.requestPublisher(.getAudioContentByTheme(themeId: themeId, page: page, size: size, sort: sort)) return api.requestPublisher(
.getAudioContentByTheme(
themeId: themeId,
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL,
page: page,
size: size,
sort: sort
)
)
} }
} }

12
SodaLive/Sources/Content/Series/SeriesApi.swift
View File

@@ -12,7 +12,7 @@ enum SeriesApi {
case getSeriesList(creatorId: Int, sortType: SeriesListAllViewModel.SeriesSortType, page: Int, size: Int) case getSeriesList(creatorId: Int, sortType: SeriesListAllViewModel.SeriesSortType, page: Int, size: Int)
case getSeriesDetail(seriesId: Int) case getSeriesDetail(seriesId: Int)
case getSeriesContentList(seriesId: Int, page: Int, size: Int, sortType: SeriesListAllViewModel.SeriesSortType) case getSeriesContentList(seriesId: Int, page: Int, size: Int, sortType: SeriesListAllViewModel.SeriesSortType)
case getRecommendSeriesList case getRecommendSeriesList(isAdultContentVisible: Bool, contentType: ContentType)
} }
extension SeriesApi: TargetType { extension SeriesApi: TargetType {
@@ -55,9 +55,17 @@ extension SeriesApi: TargetType {
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString) return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
case .getSeriesDetail, .getRecommendSeriesList: case .getSeriesDetail:
return .requestPlain return .requestPlain
case .getRecommendSeriesList(let isAdultContentVisible, let contentType):
let parameters = [
"isAdultContentVisible": isAdultContentVisible,
"contentType": contentType
] as [String : Any]
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
case .getSeriesContentList(_, let page, let size, let sortType): case .getSeriesContentList(_, let page, let size, let sortType):
let parameters = [ let parameters = [
"page": page - 1, "page": page - 1,

7
SodaLive/Sources/Content/Series/SeriesRepository.swift
View File

@@ -26,6 +26,11 @@ class SeriesRepository {
} }
func getRecommendSeriesList() -> AnyPublisher<Response, MoyaError> { func getRecommendSeriesList() -> AnyPublisher<Response, MoyaError> {
return api.requestPublisher(.getRecommendSeriesList) return api.requestPublisher(
.getRecommendSeriesList(
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL
)
)
} }
} }