Skip to content

fix using swift standard library’s result type #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samirae wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix using swift standard library’s result type #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DeliveryApp/Domain/Use Cases/API Service/APIDeliveriable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ import RxSwift

protocol APIDeliveriable {

func fetchDeliveryList(offset: Int) -> Observable<ResultReponse<[DeliverItem]>>
func fetchDeliveryList(offset: Int) -> Observable<Result<[DeliverItem], DeliveryError>>
}
4 changes: 2 additions & 2 deletions DeliveryApp/Domain/Use Cases/Repository/DeliveryRepositoriable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import RxSwift

protocol DeliveryRepositoriable {

func fetchDeliveryList(offset: Int) -> Observable<ResultReponse<[DeliverItem]>>
func fetchDeliveryList(offset: Int) -> Observable<Result<[DeliverItem], DeliveryError>>

func removeAll()

func setFavorite(item: DeliverItem)
func setFavorite(item: DeliverItem)
}
8 changes: 4 additions & 4 deletions DeliveryApp/Platforms/API/Delivery Service/DeliveryService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import ObjectMapper

class DeliveryService: APIDeliveriable {

func fetchDeliveryList(offset: Int) -> Observable<ResultReponse<[DeliverItem]>>{
func fetchDeliveryList(offset: Int) -> Observable<Result<[DeliverItem], DeliveryError>>{

let onChange = PublishSubject<ResultReponse<[DeliverItem]>>()
let onChange = PublishSubject<Result<[DeliverItem], DeliveryError>>()

let route = Router.deliveryList(offset: offset, limit: 20)

Expand All @@ -27,10 +27,10 @@ class DeliveryService: APIDeliveriable {

let data = Mapper<DeliverItem>().mapArray(JSONObject: value)

onChange.onNext(ResultReponse.success(value: data ?? []))
onChange.onNext(.success(data ?? []))

case .failure:
onChange.onNext(ResultReponse.failure(error: .unknown))
onChange.onNext(.failure(DeliveryError.unknown))
}

}
Expand Down
13 changes: 6 additions & 7 deletions DeliveryApp/Platforms/Repository/Delivery/DeliveryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ class DeliveryRepository: DeliveryRepositoriable {
self.storgeDeliveryService = storgeDeliveryService
}

func fetchDeliveryList(offset: Int) -> Observable<ResultReponse<[DeliverItem]>> {
func fetchDeliveryList(offset: Int) -> Observable<Result<[DeliverItem], DeliveryError>> {

return Observable<ResultReponse<[DeliverItem]>>.create { observer in
return Observable<Result<[DeliverItem], DeliveryError>>.create { observer in

let db = self.storgeDeliveryService.getDeliveryList()
let count = db.count

if count > 0 && offset * 20 <= count{
observer.onNext(ResultReponse.success(value: db))
observer.onNext(.success(db))

} else {

Expand All @@ -40,15 +40,14 @@ class DeliveryRepository: DeliveryRepositoriable {
switch result.element {
case .success(let value):
self?.storgeDeliveryService.saveDeliveryList(items: value)
observer.onNext(ResultReponse.success(value: value))
observer.onNext(.success(value))

case .failure(let error):
observer.onNext(ResultReponse.failure(error: error))
observer.onNext(.failure(error))

default: break
}
}
.disposed(by: self.bag)
}.disposed(by: self.bag)
}

return Disposables.create()
Expand Down