diff --git a/DeliveryApp/Domain/Use Cases/API Service/APIDeliveriable.swift b/DeliveryApp/Domain/Use Cases/API Service/APIDeliveriable.swift index 7420fa4..8a1fdbf 100644 --- a/DeliveryApp/Domain/Use Cases/API Service/APIDeliveriable.swift +++ b/DeliveryApp/Domain/Use Cases/API Service/APIDeliveriable.swift @@ -9,5 +9,5 @@ import RxSwift protocol APIDeliveriable { - func fetchDeliveryList(offset: Int) -> Observable> + func fetchDeliveryList(offset: Int) -> Observable> } diff --git a/DeliveryApp/Domain/Use Cases/Repository/DeliveryRepositoriable.swift b/DeliveryApp/Domain/Use Cases/Repository/DeliveryRepositoriable.swift index cb28e3c..bcfe0bb 100644 --- a/DeliveryApp/Domain/Use Cases/Repository/DeliveryRepositoriable.swift +++ b/DeliveryApp/Domain/Use Cases/Repository/DeliveryRepositoriable.swift @@ -9,9 +9,9 @@ import RxSwift protocol DeliveryRepositoriable { - func fetchDeliveryList(offset: Int) -> Observable> + func fetchDeliveryList(offset: Int) -> Observable> func removeAll() - func setFavorite(item: DeliverItem) + func setFavorite(item: DeliverItem) } diff --git a/DeliveryApp/Platforms/API/Delivery Service/DeliveryService.swift b/DeliveryApp/Platforms/API/Delivery Service/DeliveryService.swift index e59bf77..ebfd725 100644 --- a/DeliveryApp/Platforms/API/Delivery Service/DeliveryService.swift +++ b/DeliveryApp/Platforms/API/Delivery Service/DeliveryService.swift @@ -12,9 +12,9 @@ import ObjectMapper class DeliveryService: APIDeliveriable { - func fetchDeliveryList(offset: Int) -> Observable>{ + func fetchDeliveryList(offset: Int) -> Observable>{ - let onChange = PublishSubject>() + let onChange = PublishSubject>() let route = Router.deliveryList(offset: offset, limit: 20) @@ -27,10 +27,10 @@ class DeliveryService: APIDeliveriable { let data = Mapper().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)) } } diff --git a/DeliveryApp/Platforms/Repository/Delivery/DeliveryRepository.swift b/DeliveryApp/Platforms/Repository/Delivery/DeliveryRepository.swift index af221a0..8c187ac 100644 --- a/DeliveryApp/Platforms/Repository/Delivery/DeliveryRepository.swift +++ b/DeliveryApp/Platforms/Repository/Delivery/DeliveryRepository.swift @@ -21,15 +21,15 @@ class DeliveryRepository: DeliveryRepositoriable { self.storgeDeliveryService = storgeDeliveryService } - func fetchDeliveryList(offset: Int) -> Observable> { + func fetchDeliveryList(offset: Int) -> Observable> { - return Observable>.create { observer in + return Observable>.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 { @@ -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()