fix(DataStore): Avoid model name from mutation sync in ModelSyncedEventEmitter (#1454)

Author: lawmicha

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/InitialSync/InitialSyncOperation.swift

@@ -185,7 +185,7 @@ final class InitialSyncOperation: AsynchronousOperation {
 
         reconciliationQueue.offer(items, modelSchema: modelSchema)
         for item in items {
-            initialSyncOperationTopic.send(.enqueued(item))
+            initialSyncOperationTopic.send(.enqueued(item, modelName: modelSchema.name))
         }
 
         if let nextToken = syncQueryResult.nextToken, recordsReceived < syncMaxRecords {

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/InitialSync/InitialSyncOperationEvent.swift

@@ -15,7 +15,7 @@ enum InitialSyncOperationEvent {
 
     /// Published when a remote model is enqueued for local store reconciliation.
     /// Used by `ModelSyncedEventEmitter` for record counting.
-    case enqueued(MutationSync<AnyModel>)
+    case enqueued(MutationSync<AnyModel>, modelName: ModelName)
 
     /// Published when the sync operation has completed and all remote models have been enqueued for reconciliation.
     /// Used by `ModelSyncedEventEmitter` to determine when to send `ModelSyncedEvent`

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/InitialSync/ModelSyncedEventEmitter.swift

@@ -72,8 +72,8 @@ final class ModelSyncedEventEmitter {
         switch value {
         case .started(let modelName, _):
             return modelSchema.name == modelName
-        case .enqueued(let mutationSync):
-            return modelSchema.name == mutationSync.model.modelName
+        case .enqueued(_, let modelName):
+            return modelSchema.name == modelName
         case .finished(let modelName):
             return modelSchema.name == modelName
         }

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/InitialSync/InitialSyncOperationTests.swift

@@ -302,8 +302,9 @@ class InitialSyncOperationTests: XCTestCase {
                     XCTAssertEqual(modelName, "MockSynced")
                     XCTAssertEqual(syncType, .fullSync)
                     syncStartedReceived.fulfill()
-                case .enqueued(let returnedValue):
+                case .enqueued(let returnedValue, let modelName):
                     XCTAssertTrue(returnedValue.syncMetadata == mutationSync.syncMetadata)
+                    XCTAssertEqual(modelName, "MockSynced")
                     offeredValueReceived.fulfill()
                 case .finished(modelName: let modelName):
                     XCTAssertEqual(modelName, "MockSynced")

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/InitialSync/SyncEventEmitterTests.swift

@@ -83,7 +83,8 @@ class SyncEventEmitterTests: XCTestCase {
 
         initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.started(modelName: Post.modelName,
                                                                             syncType: .fullSync))
-        initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.enqueued(anyPostMutationSync))
+        initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.enqueued(anyPostMutationSync,
+                                                                             modelName: Post.modelName))
         initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.finished(modelName: Post.modelName))
 
         reconciliationQueue?.incomingEventSubject.send(.mutationEventApplied(postMutationEvent))
@@ -255,12 +256,14 @@ class SyncEventEmitterTests: XCTestCase {
 
         initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.started(modelName: Post.modelName,
                                                                             syncType: .fullSync))
-        initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.enqueued(anyPostMutationSync))
+        initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.enqueued(anyPostMutationSync,
+                                                                             modelName: Post.modelName))
         initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.finished(modelName: Post.modelName))
 
         initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.started(modelName: Comment.modelName,
                                                                             syncType: .fullSync))
-        initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.enqueued(anyCommentMutationSync))
+        initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.enqueued(anyCommentMutationSync,
+                                                                             modelName: Comment.modelName))
         initialSyncOrchestrator?.initialSyncOrchestratorTopic.send(.finished(modelName: Comment.modelName))
 
         reconciliationQueue?.incomingEventSubject.send(.mutationEventApplied(postMutationEvent))