Added ability to specify custom result provider (#6)

syngenta · Aug 11, 2023 · ebcd98e · ebcd98e
1 parent 0ea300c
commit ebcd98e
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 23 deletions.
diff --git a/Sources/Synchronization-swift/AnySynchronizationCustomPerformer.swift b/Sources/Synchronization-swift/AnySynchronizationCustomPerformer.swift
@@ -10,14 +10,37 @@ import PromiseKit
 
 public protocol AnySynchronizationCustomPerformer: AnyObject {
     func customPerform<Result: AnySyncResult>(for request: URLRequest, node: SyncNode) -> Promise<Result>?
+    func customResult<Result: AnySyncResult>(data: Data,
+                                             request: URLRequest,
+                                             response: URLResponse,
+                                             node: SyncNode) throws -> Result?
     func resolve(error: Error, model: AnySynchronizable, settings: AnySyncSettings) -> SynchronizationResolveTypes
     func afterSynchronization(model: AnySynchronizable, result: AnySyncResult) -> Promise<Void>
     func afterAll(model: AnySynchronizable, result: AnySyncResult) -> Promise<Void>
 }
 
 public extension AnySynchronizationCustomPerformer { // for optional
-    func customPerform<Result: AnySynchronizable>(for request: URLRequest, node: SyncNode) -> Promise<Result>? { nil }
-    func resolve(error: Error, model: AnySynchronizable) -> SynchronizationResolveTypes { .none }
-    func afterSynchronization(model: AnySynchronizable, result: AnySyncResult) -> Promise<Void> { .value }
-    func afterAll(model: AnySynchronizable, result: AnySyncResult) -> Promise<Void> { .value }
+
+    func customPerform<Result: AnySynchronizable>(for request: URLRequest, node: SyncNode) -> Promise<Result>? {
+        nil
+    }
+
+    func customResult<Result: AnySyncResult>(data: Data,
+                                             request: URLRequest,
+                                             response: URLResponse,
+                                             node: SyncNode) throws -> Result? {
+        nil
+    }
+
+    func resolve(error: Error, model: AnySynchronizable) -> SynchronizationResolveTypes {
+        .none
+    }
+
+    func afterSynchronization(model: AnySynchronizable, result: AnySyncResult) -> Promise<Void> {
+        .value
+    }
+
+    func afterAll(model: AnySynchronizable, result: AnySyncResult) -> Promise<Void> {
+        .value
+    }
 }
diff --git a/Sources/Synchronization-swift/SynchronizationManager.swift b/Sources/Synchronization-swift/SynchronizationManager.swift
@@ -8,24 +8,6 @@
 import Foundation
 import PromiseKit
 
-public enum SynchronizationResolveTypes { // TODO: move
-
-    /// Not resolve and throw error
-    case none
-
-    /// Retry same operation
-    case retry
-
-    /// Retry same operation after delay in seconds
-    case retryAfter(seconds: TimeInterval)
-
-    /// Retry with another URLRequest
-    case retryWith(request: URLRequest)
-
-    /// Reset type will call object request from AnySynchronizable
-    case reset
-}
-
 public final class SynchronizationManager<Result: AnySyncResult> {
 
     private let settings: AnySyncSettings
@@ -72,7 +54,22 @@ public final class SynchronizationManager<Result: AnySyncResult> {
             return result
         } else {
             return self.service.perform(for: request)
-                .map { try Result.from(data: $0.data, request: request, response: $0.response) }
+                .map { result in
+                    let customResult: Result? = try customPerformer?.customResult(
+                        data: result.data,
+                        request: request,
+                        response: result.response,
+                        node: node
+                    )
+                    let result = {
+                        try Result.from(
+                            data: result.data,
+                            request: request,
+                            response: result.response
+                        )
+                    }
+                    return try customResult ?? result()
+                }
                 .recover {
                     tryToResolve ? self.tryToResolve(
                         error: $0,

diff --git a/Sources/Synchronization-swift/SynchronizationResolveTypes.swift b/Sources/Synchronization-swift/SynchronizationResolveTypes.swift
@@ -0,0 +1,26 @@
+//
+//  File.swift
+//  
+//
+//  Created by Evegeny Kalashnikov on 11.08.2023.
+//
+
+import Foundation
+
+public enum SynchronizationResolveTypes {
+
+    /// Not resolve and throw error
+    case none
+
+    /// Retry same operation
+    case retry
+
+    /// Retry same operation after delay in seconds
+    case retryAfter(seconds: TimeInterval)
+
+    /// Retry with another URLRequest
+    case retryWith(request: URLRequest)
+
+    /// Reset type will call object request from AnySynchronizable
+    case reset
+}