TouchInstinct
/
LeadKit
305
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subscribe mapping on background queue

This commit is contained in:
Ivan Smolin 2016-12-29 20:03:43 +03:00
parent dd26a70db0
commit 0348ba613e
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LeadKit/LeadKit/Extensions/Alamofire/AlamofireManager+Extensions.swift
View File

@ -31,7 +31,6 @@ public extension Reactive where Base: Alamofire.SessionManager {
/// - Returns: Observable with HTTP URL Response and target object
func responseModel<T: ImmutableMappable>(requestParameters: ApiRequestParameters) -> Observable<(HTTPURLResponse, T)> {
return apiRequest(requestParameters: requestParameters)
.observeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
.flatMap { $0.rx.apiResponse() }
}
@ -43,7 +42,6 @@ public extension Reactive where Base: Alamofire.SessionManager {
Observable<(HTTPURLResponse, T)> where T.ModelType == T {
return apiRequest(requestParameters: requestParameters)
.observeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
.flatMap { $0.rx.apiResponse() }
}

30
LeadKit/LeadKit/Extensions/Alamofire/AlamofireRequest+Extensions.swift
View File

@ -15,25 +15,33 @@ public extension Reactive where Base: DataRequest {
/// Method which serializes response into target object
///
/// - Parameter mappingQueueQoS: QoS of underlying scheduler queue on which mapping will be executed
/// - Returns: Observable with HTTP URL Response and target object
func apiResponse<T: ImmutableMappable>() -> Observable<(HTTPURLResponse, T)> {
return responseJSON().map { resp, value in
let json = try cast(value) as [String: Any]
func apiResponse<T: ImmutableMappable>(mappingQueueQoS: DispatchQoS = .default) -> Observable<(HTTPURLResponse, T)> {
return responseJSON()
.map { resp, value in
let json = try cast(value) as [String: Any]
return (resp, try T(JSON: json))
}
return (resp, try T(JSON: json))
}
.subscribeOn(ConcurrentDispatchQueueScheduler(qos: mappingQueueQoS))
}
/// Method which serializes response into target object
///
/// - Parameter mappingQueueQoS: QoS of underlying scheduler queue on which mapping will be executed
/// - Returns: Observable with HTTP URL Response and target object
func apiResponse<T: ObservableMappable>() -> Observable<(HTTPURLResponse, T)> where T.ModelType == T {
return responseJSON().flatMap { resp, value -> Observable<(HTTPURLResponse, T)> in
let json = try cast(value) as [String: Any]
func apiResponse<T: ObservableMappable>(mappingQueueQoS: DispatchQoS = .default) -> Observable<(HTTPURLResponse, T)>
where T.ModelType == T {
return T.createFrom(map: Map(mappingType: .fromJSON, JSON: json))
.map { (resp, $0) }
}
return responseJSON()
.flatMap { resp, value -> Observable<(HTTPURLResponse, T)> in
let json = try cast(value) as [String: Any]
return T.createFrom(map: Map(mappingType: .fromJSON, JSON: json))
.map { (resp, $0) }
.subscribeOn(ConcurrentDispatchQueueScheduler(qos: mappingQueueQoS))
}
}
}