feat(series-all-day-of-week): 시리즈 전체보기 요일별 탭 API 추가
This commit is contained in:
@@ -8,8 +8,63 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct SeriesMainDayOfWeekView: View {
|
struct SeriesMainDayOfWeekView: View {
|
||||||
|
|
||||||
|
@StateObject var viewModel = SeriesMainDayOfWeekViewModel()
|
||||||
|
|
||||||
|
@State private var dayOfWeek: SeriesPublishedDaysOfWeek = .SAT
|
||||||
|
|
||||||
|
private let dayOfWeekItems: [DayOfWeek] = [
|
||||||
|
DayOfWeek(dayOfWeekStr: "월", dayOfWeek: .MON),
|
||||||
|
DayOfWeek(dayOfWeekStr: "화", dayOfWeek: .TUE),
|
||||||
|
DayOfWeek(dayOfWeekStr: "수", dayOfWeek: .WED),
|
||||||
|
DayOfWeek(dayOfWeekStr: "목", dayOfWeek: .THU),
|
||||||
|
DayOfWeek(dayOfWeekStr: "금", dayOfWeek: .FRI),
|
||||||
|
DayOfWeek(dayOfWeekStr: "토", dayOfWeek: .SAT),
|
||||||
|
DayOfWeek(dayOfWeekStr: "일", dayOfWeek: .SUN),
|
||||||
|
DayOfWeek(dayOfWeekStr: "랜덤", dayOfWeek: .RANDOM),
|
||||||
|
]
|
||||||
|
|
||||||
|
// 요일 숫자에 맞춰 배열
|
||||||
|
private let dayOfWeeks: [SeriesPublishedDaysOfWeek] = [
|
||||||
|
.RANDOM,
|
||||||
|
.SUN,
|
||||||
|
.MON,
|
||||||
|
.TUE,
|
||||||
|
.WED,
|
||||||
|
.THU,
|
||||||
|
.FRI,
|
||||||
|
.SAT
|
||||||
|
]
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Text("시리즈 전체보기 요일별")
|
ZStack {
|
||||||
|
VStack(spacing: 16) {
|
||||||
|
|
||||||
|
}
|
||||||
|
.popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .bottom, autohideIn: 2) {
|
||||||
|
HStack {
|
||||||
|
Spacer()
|
||||||
|
Text(viewModel.errorMessage)
|
||||||
|
.padding(.vertical, 13.3)
|
||||||
|
.frame(width: screenSize().width - 66.7, alignment: .center)
|
||||||
|
.font(.custom(Font.medium.rawValue, size: 12))
|
||||||
|
.background(Color.button)
|
||||||
|
.foregroundColor(Color.white)
|
||||||
|
.multilineTextAlignment(.leading)
|
||||||
|
.cornerRadius(20)
|
||||||
|
.padding(.bottom, 66.7)
|
||||||
|
Spacer()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.onAppear {
|
||||||
|
dayOfWeek = dayOfWeeks[Calendar.current.component(.weekday, from: Date())]
|
||||||
|
viewModel.getDayOfWeekSeriesList(dayOfWeek: dayOfWeek)
|
||||||
|
}
|
||||||
|
|
||||||
|
if viewModel.isLoading {
|
||||||
|
LoadingView()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,3 +6,69 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
|
import Combine
|
||||||
|
|
||||||
|
final class SeriesMainDayOfWeekViewModel: ObservableObject {
|
||||||
|
private let repository = SeriesMainRepository()
|
||||||
|
private var subscription = Set<AnyCancellable>()
|
||||||
|
|
||||||
|
@Published var isLoading = false
|
||||||
|
@Published var errorMessage = ""
|
||||||
|
@Published var isShowPopup = false
|
||||||
|
|
||||||
|
@Published var seriesList: [SeriesListItem] = []
|
||||||
|
|
||||||
|
private var page = 1
|
||||||
|
private var isLast = false
|
||||||
|
private let pageSize = 20
|
||||||
|
|
||||||
|
func getDayOfWeekSeriesList(dayOfWeek: SeriesPublishedDaysOfWeek) {
|
||||||
|
if !isLoading && !isLast {
|
||||||
|
isLoading = true
|
||||||
|
|
||||||
|
repository.getDayOfWeekSeriesList(dayOfWeek: dayOfWeek, page: page, size: pageSize)
|
||||||
|
.sink { result in
|
||||||
|
switch result {
|
||||||
|
case .finished:
|
||||||
|
DEBUG_LOG("finish")
|
||||||
|
case .failure(let error):
|
||||||
|
ERROR_LOG(error.localizedDescription)
|
||||||
|
}
|
||||||
|
} receiveValue: { [unowned self] response in
|
||||||
|
let responseData = response.data
|
||||||
|
|
||||||
|
do {
|
||||||
|
let jsonDecoder = JSONDecoder()
|
||||||
|
let decoded = try jsonDecoder.decode(ApiResponse<[SeriesListItem]>.self, from: responseData)
|
||||||
|
|
||||||
|
if let data = decoded.data, decoded.success {
|
||||||
|
if page == 1 {
|
||||||
|
self.seriesList.removeAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
if !data.isEmpty {
|
||||||
|
page += 1
|
||||||
|
self.seriesList.append(contentsOf: data)
|
||||||
|
} else {
|
||||||
|
isLast = true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if let message = decoded.message {
|
||||||
|
self.errorMessage = message
|
||||||
|
} else {
|
||||||
|
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
|
||||||
|
}
|
||||||
|
|
||||||
|
self.isShowPopup = true
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
|
||||||
|
self.isShowPopup = true
|
||||||
|
}
|
||||||
|
|
||||||
|
self.isLoading = false
|
||||||
|
}
|
||||||
|
.store(in: &subscription)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import Moya
|
|||||||
enum SeriesMainApi {
|
enum SeriesMainApi {
|
||||||
case fetchHome(isAdultContentVisible: Bool, contentType: ContentType)
|
case fetchHome(isAdultContentVisible: Bool, contentType: ContentType)
|
||||||
case getRecommendSeriesList(isAdultContentVisible: Bool, contentType: ContentType)
|
case getRecommendSeriesList(isAdultContentVisible: Bool, contentType: ContentType)
|
||||||
|
case getDayOfWeekSeriesList(dayOfWeek: SeriesPublishedDaysOfWeek, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
|
||||||
}
|
}
|
||||||
|
|
||||||
extension SeriesMainApi: TargetType {
|
extension SeriesMainApi: TargetType {
|
||||||
@@ -22,6 +23,9 @@ extension SeriesMainApi: TargetType {
|
|||||||
|
|
||||||
case .getRecommendSeriesList:
|
case .getRecommendSeriesList:
|
||||||
return "/audio-content/series/main/recommend"
|
return "/audio-content/series/main/recommend"
|
||||||
|
|
||||||
|
case .getDayOfWeekSeriesList:
|
||||||
|
return "/audio-content/series/main/day-of-week"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,6 +45,17 @@ extension SeriesMainApi: TargetType {
|
|||||||
"contentType": contentType,
|
"contentType": contentType,
|
||||||
] as [String : Any]
|
] as [String : Any]
|
||||||
|
|
||||||
|
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
|
||||||
|
|
||||||
|
case .getDayOfWeekSeriesList(let dayOfWeek, let isAdultContentVisible, let contentType, let page, let size):
|
||||||
|
var parameters = [
|
||||||
|
"dayOfWeek": dayOfWeek,
|
||||||
|
"isAdultContentVisible": isAdultContentVisible,
|
||||||
|
"contentType": contentType,
|
||||||
|
"page": page - 1,
|
||||||
|
"size": size
|
||||||
|
] as [String : Any]
|
||||||
|
|
||||||
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
|
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,4 +30,16 @@ class SeriesMainRepository {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getDayOfWeekSeriesList(dayOfWeek: SeriesPublishedDaysOfWeek, page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
|
||||||
|
return api.requestPublisher(
|
||||||
|
.getDayOfWeekSeriesList(
|
||||||
|
dayOfWeek: dayOfWeek,
|
||||||
|
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
|
||||||
|
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL,
|
||||||
|
page: page,
|
||||||
|
size: size
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user