LOOP-3830 PumpManager sync updates (#456)

* PumpManager protocol changes for syncing

* Remove debug prints

Author: ps2

Loop/Extensions/DeviceDataManager+BolusEntryViewModelDelegate.swift

@@ -44,7 +44,7 @@ extension DeviceDataManager: BolusEntryViewModelDelegate, ManualDoseViewModelDel
         carbStore.carbsOnBoard(at: date, effectVelocities: effectVelocities, completion: completion)
     }
 
-    func ensureCurrentPumpData(completion: @escaping () -> Void) {
+    func ensureCurrentPumpData(completion: @escaping (Date?) -> Void) {
         pumpManager?.ensureCurrentPumpData(completion: completion)
     }
 

Loop/Managers/DeviceDataManager.swift

@@ -245,7 +245,7 @@ final class DeviceDataManager {
             basalProfile: UserDefaults.appGroup?.basalRateSchedule,
             insulinSensitivitySchedule: sensitivitySchedule,
             overrideHistory: overrideHistory,
-            lastPumpEventsReconciliation: pumpManager?.lastReconciliation,
+            lastPumpEventsReconciliation: pumpManager?.lastSync,
             provenanceIdentifier: HKSource.default().bundleIdentifier
         )
 
@@ -289,7 +289,7 @@ final class DeviceDataManager {
             lastLoopCompleted: statusExtensionManager.context?.lastLoopCompleted,
             basalDeliveryState: pumpManager?.status.basalDeliveryState,
             overrideHistory: overrideHistory,
-            lastPumpEventsReconciliation: pumpManager?.lastReconciliation,
+            lastPumpEventsReconciliation: pumpManager?.lastSync,
             analyticsServicesManager: analyticsServicesManager,
             localCacheDuration: localCacheDuration,
             doseStore: doseStore,
@@ -431,7 +431,12 @@ final class DeviceDataManager {
             log.default("CGMManager:%{public}@ did update with %d values", String(describing: type(of: manager)), values.count)
             loopManager.addGlucoseSamples(values) { result in
                 self.log.default("Asserting current pump data")
-                self.pumpManager?.ensureCurrentPumpData(completion: nil)
+                self.pumpManager?.ensureCurrentPumpData(completion: { (lastSync) in
+                    if let lastSync = lastSync, Date().timeIntervalSince(lastSync) < LoopCoreConstants.inputDataRecencyInterval {
+                        self.log.default("Pump data from %@ is fresh. Triggering loop()", String(describing: type(of: self.pumpManager)))
+                        self.loopManager.loop()
+                    }
+                })
                 if !values.isEmpty {
                     DispatchQueue.main.async {
                         self.cgmStalenessMonitor.cgmGlucoseSamplesAvailable(values)
@@ -1004,11 +1009,11 @@ extension DeviceDataManager: PumpManagerDelegate {
         loopManager.storeDosingDecision(withDate: Date(), withError: error)
     }
 
-    func pumpManager(_ pumpManager: PumpManager, hasNewPumpEvents events: [NewPumpEvent], lastReconciliation: Date?, completion: @escaping (_ error: Error?) -> Void) {
+    func pumpManager(_ pumpManager: PumpManager, hasNewPumpEvents events: [NewPumpEvent], lastSync: Date?, completion: @escaping (_ error: Error?) -> Void) {
         dispatchPrecondition(condition: .onQueue(queue))
         log.default("PumpManager:%{public}@ did read pump events", String(describing: type(of: pumpManager)))
 
-        loopManager.addPumpEvents(events, lastReconciliation: lastReconciliation) { (error) in
+        loopManager.addPumpEvents(events, lastReconciliation: lastSync) { (error) in
             if let error = error {
                 self.log.error("Failed to addPumpEvents to DoseStore: %{public}@", String(describing: error))
             }
@@ -1036,12 +1041,6 @@ extension DeviceDataManager: PumpManagerDelegate {
         }
     }
 
-    func pumpManagerRecommendsLoop(_ pumpManager: PumpManager) {
-        dispatchPrecondition(condition: .onQueue(queue))
-        log.default("PumpManager:%{public}@ recommends loop", String(describing: type(of: pumpManager)))
-        loopManager.loop()
-    }
-
     func startDateToFilterNewPumpEvents(for manager: PumpManager) -> Date {
         dispatchPrecondition(condition: .onQueue(queue))
         return doseStore.pumpEventQueryAfterDate

Loop/View Models/BolusEntryViewModel.swift

@@ -36,7 +36,7 @@ protocol BolusEntryViewModelDelegate: AnyObject {
 
     func carbsOnBoard(at date: Date, effectVelocities: [GlucoseEffectVelocity]?, completion: @escaping (_ result: CarbStoreResult<CarbValue>) -> Void)
 
-    func ensureCurrentPumpData(completion: @escaping () -> Void)
+    func ensureCurrentPumpData(completion: @escaping (Date?) -> Void)
 
     func insulinActivityDuration(for type: InsulinType?) -> TimeInterval
 
@@ -217,15 +217,16 @@ final class BolusEntryViewModel: ObservableObject {
         observeEnteredManualGlucoseChanges()
         observeElapsedTime()
         observeRecommendedBolusChanges()
-
         update()
     }
 
     private func observeLoopUpdates() {
         NotificationCenter.default
             .publisher(for: .LoopDataUpdated)
             .receive(on: DispatchQueue.main)
-            .sink { [weak self] _ in self?.update() }
+            .sink { [weak self] _ in
+                self?.update()
+            }
             .store(in: &cancellables)
     }
 
@@ -653,7 +654,7 @@ final class BolusEntryViewModel: ObservableObject {
         DispatchQueue.main.async {
             // v-- This needs to happen on the main queue
             self.isRefreshingPump = true
-            let wrappedCompletion: () -> Void = { [weak self] in
+            let wrappedCompletion: (Date?) -> Void = { [weak self] (lastSync) in
                 self?.delegate?.withLoopState { [weak self] _ in
                     // v-- This needs to happen in LoopDataManager's dataQueue
                     completion()

LoopTests/Managers/DoseEnactorTests.swift

@@ -53,7 +53,7 @@ class MockPumpManager: PumpManager {
 
     var pumpReservoirCapacity: Double = 50
 
-    var lastReconciliation: Date?
+    var lastSync: Date?
 
     var status: PumpManagerStatus =
         PumpManagerStatus(
@@ -70,8 +70,8 @@ class MockPumpManager: PumpManager {
     func removeStatusObserver(_ observer: PumpManagerStatusObserver) {
     }
 
-    func ensureCurrentPumpData(completion: (() -> Void)?) {
-        completion?()
+    func ensureCurrentPumpData(completion: ((Date?) -> Void)?) {
+        completion?(Date())
     }
 
     func setMustProvideBLEHeartbeat(_ mustProvideBLEHeartbeat: Bool) {

LoopTests/ViewModels/BolusEntryViewModelTests.swift

@@ -395,7 +395,7 @@ class BolusEntryViewModelTests: XCTestCase {
         try triggerLoopStateUpdatedWithDataAndWait()
         XCTAssertTrue(bolusEntryViewModel.isRefreshingPump)
         let completion = try XCTUnwrap(delegate.ensureCurrentPumpDataCompletion)
-        completion()
+        completion(Date())
         // Need to once again trigger loop state
         try triggerLoopStateResult(with: MockLoopState())
         // then wait on main again (sigh)
@@ -946,8 +946,8 @@ fileprivate class MockBolusEntryViewModelDelegate: BolusEntryViewModelDelegate {
         }
     }
 
-    var ensureCurrentPumpDataCompletion: (() -> Void)?
-    func ensureCurrentPumpData(completion: @escaping () -> Void) {
+    var ensureCurrentPumpDataCompletion: ((Date?) -> Void)?
+    func ensureCurrentPumpData(completion: @escaping (Date?) -> Void) {
         ensureCurrentPumpDataCompletion = completion
     }