revert some changes

ruiguoamz · ruiguoamz · commit 7db15ce4bb67 · 2020-08-25T11:07:00.000-07:00
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin.swift
@@ -102,12 +102,6 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
                 Amplify.Hub.removeListener(token)
             }
         }
-
-        let payloadOfOutboxStatus = HubPayload(eventName: HubPayload.EventName.DataStore.outboxStatusChanged)
-        Amplify.Hub.dispatch(to: .dataStore, payload: payloadOfOutboxStatus)
-
-        let payload = HubPayload(eventName: HubPayload.EventName.DataStore.ready)
-        Amplify.Hub.dispatch(to: .dataStore, payload: payload)
     }
 
     func reinitStorageEngineIfNeeded() {
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/InitialSync/InitialSyncOperation.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/InitialSync/InitialSyncOperation.swift
@@ -55,42 +55,6 @@ final class InitialSyncOperation: AsynchronousOperation {
         log.info("Beginning sync for \(modelType.modelName)")
         let lastSyncTime = getLastSyncTime()
         query(lastSyncTime: lastSyncTime)
-
-        var modelSyncedPayload = ModelSyncedPayload()
-        modelSyncedPayload.modelName = modelType.modelName
-        modelSyncedPayload.isFullSync = lastSyncTime == 0 ? true : false
-        modelSyncedPayload.isDeltaSync = !modelSyncedPayload.isFullSync
-
-        guard let reconciliationQueue = reconciliationQueue else {
-            return
-        }
-
-        _ = reconciliationQueue.publisher.sink(
-            receiveCompletion: { result in
-            print(result)
-        }, receiveValue: { result in
-            print(result)
-            switch result {
-            case .initialized, .started, .paused:
-                print(result)
-            case .mutationEvent(let mutationEvent):
-                modelSyncedPayload.modelName = mutationEvent.modelName
-                switch mutationEvent.mutationType {
-                case "create":
-                    modelSyncedPayload.createCount += 1
-                case "update":
-                     modelSyncedPayload.updateCount += 1
-                case "delete":
-                     modelSyncedPayload.deleteCount += 1
-                default:
-                    print(result)
-                }
-            }
-        })
-
-        let payload = HubPayload(eventName: HubPayload.EventName.DataStore.modelSynced,
-                                 data: modelSyncedPayload)
-        Amplify.Hub.dispatch(to: .dataStore, payload: payload)
     }
 
     private func getLastSyncTime() -> Int? {
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/MutationSync/OutgoingMutationQueue/SyncMutationToCloudOperation.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/MutationSync/OutgoingMutationQueue/SyncMutationToCloudOperation.swift
@@ -166,7 +166,6 @@ class SyncMutationToCloudOperation: Operation {
             if let reachability = api as? APICategoryReachabilityBehavior {
                 do {
                     networkReachabilityPublisher = try reachability.reachabilityPublisher(for: request.apiName)
-
                 } catch {
                     log.error("\(#function): Unable to listen on reachability: \(error)")
                 }
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/RemoteSyncEngine.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/RemoteSyncEngine.swift
@@ -126,12 +126,6 @@ class RemoteSyncEngine: RemoteSyncEngineBehavior {
                 }
         }
 
-//        _ = self.networkReachabilityPublisher?.sink(receiveValue: { value in
-//            let payload = HubPayload(eventName: HubPayload.EventName.DataStore.networkStatusChanged,
-//                                     data: value.isOnline)
-//            Amplify.Hub.dispatch(to: .dataStore, payload: payload)
-//        })
-
         self.outgoingMutationQueueSink = self.outgoingMutationQueue.publisher.sink { mutationEvent in
             self.remoteSyncTopicPublisher.send(.mutationEvent(mutationEvent))
         }
@@ -331,9 +325,6 @@ class RemoteSyncEngine: RemoteSyncEngineBehavior {
         Amplify.Hub.dispatch(to: .dataStore,
                              payload: HubPayload(eventName: HubPayload.EventName.DataStore.syncStarted))
 
-        Amplify.Hub.dispatch(to: .dataStore,
-                             payload: HubPayload(eventName: HubPayload.EventName.DataStore.ready))
-
         remoteSyncTopicPublisher.send(.syncStarted)
         stateMachine.notify(action: .notifiedSyncStarted)
     }
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/AWSIncomingEventReconciliationQueue.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/AWSIncomingEventReconciliationQueue.swift
@@ -67,7 +67,7 @@ final class AWSIncomingEventReconciliationQueue: IncomingEventReconciliationQueu
             }
             reconciliationQueues[modelName] = queue
             let modelReconciliationQueueSink = queue.publisher.sink(receiveCompletion: onReceiveCompletion(completed:),
-                                                                     receiveValue: onReceiveValue(receiveValue:))
+                                                                    receiveValue: onReceiveValue(receiveValue:))
             modelReconciliationQueueSinks[modelName] = modelReconciliationQueueSink
         }
     }
@@ -148,6 +148,3 @@ extension AWSIncomingEventReconciliationQueue: Resettable {
     }
 
 }
-
-@available(iOS 13.0, *)
-extension AWSIncomingEventReconciliationQueue: DefaultLogger { }
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/AWSModelReconciliationQueue.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/AWSModelReconciliationQueue.swift
@@ -155,6 +155,7 @@ final class AWSModelReconciliationQueue: ModelReconciliationQueue {
     private func receiveCompletion(_ completion: Subscribers.Completion<DataStoreError>) {
         switch completion {
         case .finished:
+            log.info("receivedCompletion: finished")
             modelReconciliationQueueSubject.send(completion: .finished)
         case .failure(let dataStoreError):
             log.error("receiveCompletion: error: \(dataStoreError)")
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/ReconcileAndLocalSaveOperation.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/ReconcileAndLocalSaveOperation.swift
@@ -60,6 +60,7 @@ class ReconcileAndLocalSaveOperation: AsynchronousOperation {
                     self.respond(to: newState)
                 }
         }
+
     }
 
     override func main() {
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/TestSupport/Mocks/MockAWSInitialSyncOrchestrator.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/TestSupport/Mocks/MockAWSInitialSyncOrchestrator.swift
@@ -22,7 +22,7 @@ class MockAWSInitialSyncOrchestrator: InitialSyncOrchestrator {
                                        storageAdapter: storageAdapter)
     }
 
-    typealias SyncOperationResult = Result<ModelSyncPayload?, DataStoreError>
+    typealias SyncOperationResult = Result<ModelSyncedPayload?, DataStoreError>
     typealias SyncOperationResultHandler = (SyncOperationResult) -> Void
 
     private static var instance: MockAWSInitialSyncOrchestrator?
@@ -43,7 +43,7 @@ class MockAWSInitialSyncOrchestrator: InitialSyncOrchestrator {
     }
 
     func sync(completion: @escaping SyncOperationResultHandler) {
-        let response = MockAWSInitialSyncOrchestrator.mockedResponse ?? .successfulVoid
+        let response = MockAWSInitialSyncOrchestrator.mockedResponse ?? .success(nil)
         completion(response)
     }
 }
diff --git a/AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/TestSupport/Mocks/NoOpInitialSyncOrchestrator.swift b/AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/TestSupport/Mocks/NoOpInitialSyncOrchestrator.swift
@@ -13,7 +13,7 @@ struct NoOpInitialSyncOrchestrator: InitialSyncOrchestrator {
         NoOpInitialSyncOrchestrator()
     }
 
-    func sync(completion: @escaping (Result<Void, DataStoreError>) -> Void) {
-        completion(Result.successfulVoid)
+    func sync(completion: @escaping (Result<ModelSyncedPayload?, DataStoreError>) -> Void) {
+        completion(Result.success(nil))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,6 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {`
`102`	`102`	`Amplify.Hub.removeListener(token)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`		`-`
`106`		`- let payloadOfOutboxStatus = HubPayload(eventName: HubPayload.EventName.DataStore.outboxStatusChanged)`
`107`		`- Amplify.Hub.dispatch(to: .dataStore, payload: payloadOfOutboxStatus)`
`108`		`-`
`109`		`- let payload = HubPayload(eventName: HubPayload.EventName.DataStore.ready)`
`110`		`- Amplify.Hub.dispatch(to: .dataStore, payload: payload)`
`111`	`105`	`}`
`112`	`106`
`113`	`107`	`func reinitStorageEngineIfNeeded() {`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ class SyncMutationToCloudOperation: Operation {`
`166`	`166`	`if let reachability = api as? APICategoryReachabilityBehavior {`
`167`	`167`	`do {`
`168`	`168`	`networkReachabilityPublisher = try reachability.reachabilityPublisher(for: request.apiName)`
`169`		`-`
`170`	`169`	`} catch {`
`171`	`170`	`log.error("\(#function): Unable to listen on reachability: \(error)")`
`172`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,6 @@ class RemoteSyncEngine: RemoteSyncEngineBehavior {`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`129`		`-// _ = self.networkReachabilityPublisher?.sink(receiveValue: { value in`
`130`		`-// let payload = HubPayload(eventName: HubPayload.EventName.DataStore.networkStatusChanged,`
`131`		`-// data: value.isOnline)`
`132`		`-// Amplify.Hub.dispatch(to: .dataStore, payload: payload)`
`133`		`-// })`
`134`		`-`
`135`	`129`	`self.outgoingMutationQueueSink = self.outgoingMutationQueue.publisher.sink { mutationEvent in`
`136`	`130`	`self.remoteSyncTopicPublisher.send(.mutationEvent(mutationEvent))`
`137`	`131`	`}`
`@@ -331,9 +325,6 @@ class RemoteSyncEngine: RemoteSyncEngineBehavior {`
`331`	`325`	`Amplify.Hub.dispatch(to: .dataStore,`
`332`	`326`	`payload: HubPayload(eventName: HubPayload.EventName.DataStore.syncStarted))`
`333`	`327`
`334`		`- Amplify.Hub.dispatch(to: .dataStore,`
`335`		`- payload: HubPayload(eventName: HubPayload.EventName.DataStore.ready))`
`336`		`-`
`337`	`328`	`remoteSyncTopicPublisher.send(.syncStarted)`
`338`	`329`	`stateMachine.notify(action: .notifiedSyncStarted)`
`339`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ final class AWSIncomingEventReconciliationQueue: IncomingEventReconciliationQueu`
`67`	`67`	`}`
`68`	`68`	`reconciliationQueues[modelName] = queue`
`69`	`69`	`let modelReconciliationQueueSink = queue.publisher.sink(receiveCompletion: onReceiveCompletion(completed:),`
`70`		`- receiveValue: onReceiveValue(receiveValue:))`
	`70`	`+ receiveValue: onReceiveValue(receiveValue:))`
`71`	`71`	`modelReconciliationQueueSinks[modelName] = modelReconciliationQueueSink`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -148,6 +148,3 @@ extension AWSIncomingEventReconciliationQueue: Resettable {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`}`
`151`		`-`
`152`		`-@available(iOS 13.0, *)`
`153`		`-extension AWSIncomingEventReconciliationQueue: DefaultLogger { }`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ class ReconcileAndLocalSaveOperation: AsynchronousOperation {`
`60`	`60`	`self.respond(to: newState)`
`61`	`61`	`}`
`62`	`62`	`}`
	`63`	`+`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`override func main() {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class MockAWSInitialSyncOrchestrator: InitialSyncOrchestrator {`
`22`	`22`	`storageAdapter: storageAdapter)`
`23`	`23`	`}`
`24`	`24`
`25`		`- typealias SyncOperationResult = Result<ModelSyncPayload?, DataStoreError>`
	`25`	`+ typealias SyncOperationResult = Result<ModelSyncedPayload?, DataStoreError>`
`26`	`26`	`typealias SyncOperationResultHandler = (SyncOperationResult) -> Void`
`27`	`27`
`28`	`28`	`private static var instance: MockAWSInitialSyncOrchestrator?`
`@@ -43,7 +43,7 @@ class MockAWSInitialSyncOrchestrator: InitialSyncOrchestrator {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func sync(completion: @escaping SyncOperationResultHandler) {`
`46`		`- let response = MockAWSInitialSyncOrchestrator.mockedResponse ?? .successfulVoid`
	`46`	`+ let response = MockAWSInitialSyncOrchestrator.mockedResponse ?? .success(nil)`
`47`	`47`	`completion(response)`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ struct NoOpInitialSyncOrchestrator: InitialSyncOrchestrator {`
`13`	`13`	`NoOpInitialSyncOrchestrator()`
`14`	`14`	`}`
`15`	`15`
`16`		`- func sync(completion: @escaping (Result<Void, DataStoreError>) -> Void) {`
`17`		`- completion(Result.successfulVoid)`
	`16`	`+ func sync(completion: @escaping (Result<ModelSyncedPayload?, DataStoreError>) -> Void) {`
	`17`	`+ completion(Result.success(nil))`
`18`	`18`	`}`
`19`	`19`	`}`