resolve comments

aws-amplify · Nov 29, 2023 · 4077e16 · 4077e16
1 parent e786c99
commit 4077e16
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 524 deletions.
diff --git a/Amplify/Categories/DataStore/Subscribe/MutationEvent.swift b/Amplify/Categories/DataStore/Subscribe/MutationEvent.swift
@@ -17,8 +17,6 @@ public struct MutationEvent: Model {
     public var json: String
     public var mutationType: String
     public var createdAt: Temporal.DateTime
-
-    @available(*, deprecated, message: "version field is deprecated")
     public var version: Int?
     public var inProcess: Bool
     public var graphQLFilterJSON: String?

diff --git a/...es/AWSDataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/OutgoingMutationQueue.swift b/...es/AWSDataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/OutgoingMutationQueue.swift
@@ -201,10 +201,9 @@ final class OutgoingMutationQueue: OutgoingMutationQueueBehavior {
         }
 
         Task {
-            let latestSyncMetadata = try? storageAdapter.queryMutationSyncMetadata(for: mutationEvent.modelId, modelName: mutationEvent.modelName)
             let syncMutationToCloudOperation = await SyncMutationToCloudOperation(
                 mutationEvent: mutationEvent,
-                latestSyncMetadata: latestSyncMetadata,
+                getLatestSyncMetadata: { try? self.storageAdapter.queryMutationSyncMetadata(for: mutationEvent.modelId, modelName: mutationEvent.modelName) },
                 api: api,
                 authModeStrategy: authModeStrategy
             ) { [weak self] result in
@@ -258,12 +257,7 @@ final class OutgoingMutationQueue: OutgoingMutationQueueBehavior {
                 return
             }
             reconciliationQueue.offer([mutationSync], modelName: mutationEvent.modelName)
-            MutationEvent.reconcilePendingMutationEventsVersion(
-                sent: mutationEvent,
-                received: mutationSync,
-                storageAdapter: storageAdapter) { _ in
-                self.completeProcessingEvent(mutationEvent, mutationSync: mutationSync)
-            }
+            completeProcessingEvent(mutationEvent, mutationSync: mutationSync)
         } else {
             completeProcessingEvent(mutationEvent)
         }

diff --git a/...ataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/SyncMutationToCloudOperation.swift b/...ataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/SyncMutationToCloudOperation.swift
@@ -19,7 +19,7 @@ class SyncMutationToCloudOperation: AsynchronousOperation {
 
     private weak var api: APICategoryGraphQLBehaviorExtended?
     private let mutationEvent: MutationEvent
-    private let latestSyncMetadata: MutationSyncMetadata?
+    private let getLatestSyncMetadata: () -> MutationSyncMetadata?
     private let completion: GraphQLOperation<MutationSync<AnyModel>>.ResultListener
     private let requestRetryablePolicy: RequestRetryablePolicy
 
@@ -32,15 +32,15 @@ class SyncMutationToCloudOperation: AsynchronousOperation {
     private var authTypesIterator: AWSAuthorizationTypeIterator?
 
     init(mutationEvent: MutationEvent,
-         latestSyncMetadata: MutationSyncMetadata?,
+         getLatestSyncMetadata: @escaping () -> MutationSyncMetadata?,
          api: APICategoryGraphQLBehaviorExtended,
          authModeStrategy: AuthModeStrategy,
          networkReachabilityPublisher: AnyPublisher<ReachabilityUpdate, Never>? = nil,
          currentAttemptNumber: Int = 1,
          requestRetryablePolicy: RequestRetryablePolicy? = RequestRetryablePolicy(),
          completion: @escaping GraphQLOperation<MutationSync<AnyModel>>.ResultListener) async {
         self.mutationEvent = mutationEvent
-        self.latestSyncMetadata = latestSyncMetadata
+        self.getLatestSyncMetadata = getLatestSyncMetadata
         self.api = api
         self.networkReachabilityPublisher = networkReachabilityPublisher
         self.completion = completion
@@ -60,6 +60,7 @@ class SyncMutationToCloudOperation: AsynchronousOperation {
 
     override func main() {
         log.verbose(#function)
+
         sendMutationToCloud(withAuthType: authTypesIterator?.next())
     }
 
@@ -111,6 +112,7 @@ class SyncMutationToCloudOperation: AsynchronousOperation {
         mutationType: GraphQLMutationType,
         authType: AWSAuthorizationType? = nil
     ) -> GraphQLRequest<MutationSync<AnyModel>>? {
+        let latestSyncMetadata = getLatestSyncMetadata()
         var request: GraphQLRequest<MutationSync<AnyModel>>
 
         do {

diff --git a/...yPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/Support/MutationEvent+Extensions.swift b/...yPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/Support/MutationEvent+Extensions.swift
diff --git a/.../Tests/AWSDataStorePluginTests/Sync/MutationQueue/SyncMutationToCloudOperationTests.swift b/.../Tests/AWSDataStorePluginTests/Sync/MutationQueue/SyncMutationToCloudOperationTests.swift
@@ -69,7 +69,7 @@ class SyncMutationToCloudOperationTests: XCTestCase {
 
         let operation = await SyncMutationToCloudOperation(
             mutationEvent: mutationEvent,
-            latestSyncMetadata: nil,
+            getLatestSyncMetadata: { nil },
             api: mockAPIPlugin,
             authModeStrategy: AWSDefaultAuthModeStrategy(),
             networkReachabilityPublisher: publisher,
@@ -144,7 +144,7 @@ class SyncMutationToCloudOperationTests: XCTestCase {
         }
         let operation = await SyncMutationToCloudOperation(
             mutationEvent: mutationEvent,
-            latestSyncMetadata: nil,
+            getLatestSyncMetadata: { nil },
             api: mockAPIPlugin,
             authModeStrategy: AWSDefaultAuthModeStrategy(),
             networkReachabilityPublisher: publisher,
@@ -220,7 +220,7 @@ class SyncMutationToCloudOperationTests: XCTestCase {
         }
         let operation = await SyncMutationToCloudOperation(
             mutationEvent: mutationEvent,
-            latestSyncMetadata: nil,
+            getLatestSyncMetadata: { nil },
             api: mockAPIPlugin,
             authModeStrategy: AWSDefaultAuthModeStrategy(),
             networkReachabilityPublisher: publisher,