From 617ebbfde174bc6cc6065e835e9142fe19aa63f1 Mon Sep 17 00:00:00 2001 From: Grigory Boyko Date: Wed, 3 Aug 2022 16:33:48 +0700 Subject: [PATCH] fix: Comments from pull request --- .../{CartRequestExecutor.swift => RequestExecutor.swift} | 9 ++++----- TIEcommerce/Sources/Models/CartProduct.swift | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) rename TIEcommerce/Sources/Classes/{CartRequestExecutor.swift => RequestExecutor.swift} (96%) diff --git a/TIEcommerce/Sources/Classes/CartRequestExecutor.swift b/TIEcommerce/Sources/Classes/RequestExecutor.swift similarity index 96% rename from TIEcommerce/Sources/Classes/CartRequestExecutor.swift rename to TIEcommerce/Sources/Classes/RequestExecutor.swift index 44361c6d..45df5c0a 100644 --- a/TIEcommerce/Sources/Classes/CartRequestExecutor.swift +++ b/TIEcommerce/Sources/Classes/RequestExecutor.swift @@ -22,17 +22,16 @@ import TIFoundationUtils import TINetworking -open class CartRequestExecutor: Cancellable { +open class RequestExecutor: Cancellable { public typealias ExecutionCompletion = (EndpointRecoverableRequestResult) -> Void public typealias ExecutionClosure = (ExecutionCompletion) -> Cancellable - public typealias SuccessCompletion = (S) -> Void private let executionClosure: ExecutionClosure - public var successCompletion: SuccessCompletion - private var executingRequest: Cancellable? private var attemptsLeft: Int + + public var successCompletion: SuccessCompletion public init(executionClosure: @escaping ExecutionClosure, successCompletion: @escaping SuccessCompletion, @@ -44,7 +43,7 @@ open class CartRequestExecutor: Cancellable { } open func execute() { - executingRequest?.cancel() + cancel() executingRequest = executionClosure { [weak self] in switch $0 { diff --git a/TIEcommerce/Sources/Models/CartProduct.swift b/TIEcommerce/Sources/Models/CartProduct.swift index e4bac41e..e64a61dc 100644 --- a/TIEcommerce/Sources/Models/CartProduct.swift +++ b/TIEcommerce/Sources/Models/CartProduct.swift @@ -26,7 +26,7 @@ public protocol CartProduct { var id: String { get } ///Цена в определённой валюте var price: Int { get } - ///Сколько единиц есть доступно + ///Количество доступных единиц var availableCount: Int? { get } ///Варианты товара (фасовка, цвет, размер, и т.п.) var variants: [CartProduct] { get }