LOOP-4098 Overlay basal from history timeline instead of schedule (#701)

* Overlay basal from history timeline instead of schedule

* Remove file

Author: ps2

Loop/Extensions/DoseStore+SimulatedCoreData.swift

@@ -21,7 +21,7 @@ extension DoseStore {
     private var simulatedLimit: Int { 10000 }
     private var suspendDuration: TimeInterval { .minutes(30) }
 
-    func generateSimulatedHistoricalPumpEvents(completion: @escaping (Error?) -> Void) {
+    func generateSimulatedHistoricalPumpEvents() async throws {
         var startDate = Calendar.current.startOfDay(for: cacheStartDate)
         let endDate = Calendar.current.startOfDay(for: historicalEndDate)
         var index = 0
@@ -79,22 +79,19 @@ extension DoseStore {
 
             // Process about a day's worth at a time
             if simulated.count >= 300 {
-                if let error = addPumpEvents(events: simulated) {
-                    completion(error)
-                    return
-                }
+                try await addPumpEvents(events: simulated)
                 simulated = []
             }
 
             index += 1
             startDate = startDate.addingTimeInterval(simulatedBasalStartDateInterval)
         }
 
-        completion(addPumpEvents(events: simulated))
+        try await addPumpEvents(events: simulated)
     }
 
-    func purgeHistoricalPumpEvents(completion: @escaping (Error?) -> Void) {
-        purgePumpEventObjects(before: historicalEndDate, completion: completion)
+    func purgeHistoricalPumpEvents() async throws {
+        try await purgePumpEventObjects(before: historicalEndDate)
     }
 }
 

Loop/Managers/DeviceDataManager.swift

@@ -308,7 +308,9 @@ final class DeviceDataManager {
             pumpManager = pumpManagerFromRawValue(pumpManagerRawValue)
             // Update lastPumpEventsReconciliation on DoseStore
             if let lastSync = pumpManager?.lastSync {
-                doseStore.addPumpEvents([], lastReconciliation: lastSync) { _ in }
+                Task {
+                    try? await doseStore.addPumpEvents([], lastReconciliation: lastSync)
+                }
             }
             if let status = pumpManager?.status {
                 updatePumpIsAllowingAutomation(status: status)
@@ -1047,16 +1049,15 @@ extension DeviceDataManager: PumpManagerDelegate {
         dispatchPrecondition(condition: .onQueue(.main))
         log.default("PumpManager:%{public}@ hasNewPumpEvents (lastReconciliation = %{public}@)", String(describing: type(of: pumpManager)), String(describing: lastReconciliation))
 
-        doseStore.addPumpEvents(events, lastReconciliation: lastReconciliation, replacePendingEvents: replacePendingEvents) { (error) in
-            if let error = error {
+        Task {
+            do {
+                try await doseStore.addPumpEvents(events, lastReconciliation: lastReconciliation, replacePendingEvents: replacePendingEvents)
+            } catch {
                 self.log.error("Failed to addPumpEvents to DoseStore: %{public}@", String(describing: error))
+                completion(error)
             }
-
-            completion(error)
-
-            if error == nil {
-                NotificationCenter.default.post(name: .PumpEventsAdded, object: self, userInfo: nil)
-            }
+            completion(nil)
+            NotificationCenter.default.post(name: .PumpEventsAdded, object: self, userInfo: nil)
         }
     }
 
@@ -1131,6 +1132,10 @@ extension DeviceDataManager: CarbStoreDelegate {
 
 // MARK: - DoseStoreDelegate
 extension DeviceDataManager: DoseStoreDelegate {
+    func scheduledBasalHistory(from start: Date, to end: Date) async throws -> [AbsoluteScheduleValue<Double>] {
+        try await settingsManager.getBasalHistory(startDate: start, endDate: end)
+    }
+    
     func doseStoreHasUpdatedPumpEventData(_ doseStore: DoseStore) {
         uploadEventListener.triggerUpload(for: .pumpEvent)
     }
@@ -1175,10 +1180,12 @@ extension DeviceDataManager {
 
         let devicePredicate = HKQuery.predicateForObjects(from: [testingPumpManager.testingDevice])
         let insulinDeliveryStore = doseStore.insulinDeliveryStore
-        
-        doseStore.resetPumpData { doseStoreError in
-            guard doseStoreError == nil else {
-                completion?(doseStoreError!)
+
+        Task {
+            do {
+                try await doseStore.resetPumpData()
+            } catch {
+                completion?(error)
                 return
             }
 

Loop/Managers/LoopAppManager.swift

@@ -253,7 +253,6 @@ class LoopAppManager: NSObject {
             cacheStore: cacheStore,
             cacheLength: localCacheDuration,
             longestEffectDuration: ExponentialInsulinModelPreset.rapidActingAdult.effectDuration,
-            basalProfile: settingsManager.settings.basalRateSchedule,
             lastPumpEventsReconciliation: nil // PumpManager is nil at this point. Will update this via addPumpEvents below
         )
 
@@ -499,21 +498,6 @@ class LoopAppManager: NSObject {
                 }
             }
             .store(in: &cancellables)
-
-        // DoseStore still needs to keep updated basal schedule for now
-        NotificationCenter.default.publisher(for: .LoopDataUpdated)
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] note in
-                if let rawContext = note.userInfo?[LoopDataManager.LoopUpdateContextKey] as? LoopUpdateContext.RawValue,
-                   let context = LoopUpdateContext(rawValue: rawContext),
-                   let self,
-                   context == .preferences
-                {
-                    self.doseStore.basalProfile = self.settingsManager.settings.basalRateSchedule
-                }
-            }
-            .store(in: &cancellables)
-
     }
 
     private func loopCycleDidComplete() async {
@@ -1016,15 +1000,16 @@ extension LoopAppManager: SimulatedData {
                             return
                         }
                         self.dosingDecisionStore.generateSimulatedHistoricalDosingDecisionObjects() { error in
-                            guard error == nil else {
-                                completion(error)
-                                return
-                            }
-                            self.doseStore.generateSimulatedHistoricalPumpEvents() { error in
+                            Task {
                                 guard error == nil else {
                                     completion(error)
                                     return
                                 }
+                                do {
+                                    try await self.doseStore.generateSimulatedHistoricalPumpEvents()
+                                } catch {
+                                    completion(error)
+                                }
                                 self.deviceDataManager.deviceLog.generateSimulatedHistoricalDeviceLogEntries() { error in
                                     guard error == nil else {
                                         completion(error)
@@ -1056,28 +1041,28 @@ extension LoopAppManager: SimulatedData {
                     return
                 }
                 Task { @MainActor in
-                    self.doseStore.purgeHistoricalPumpEvents() { error in
+                    do {
+                        try await self.doseStore.purgeHistoricalPumpEvents()
+                    } catch {
+                        completion(error)
+                        return
+                    }
+                    self.dosingDecisionStore.purgeHistoricalDosingDecisionObjects() { error in
                         guard error == nil else {
                             completion(error)
                             return
                         }
-                        self.dosingDecisionStore.purgeHistoricalDosingDecisionObjects() { error in
+                        self.carbStore.purgeHistoricalCarbObjects() { error in
                             guard error == nil else {
                                 completion(error)
                                 return
                             }
-                            self.carbStore.purgeHistoricalCarbObjects() { error in
+                            self.glucoseStore.purgeHistoricalGlucoseObjects() { error in
                                 guard error == nil else {
                                     completion(error)
                                     return
                                 }
-                                self.glucoseStore.purgeHistoricalGlucoseObjects() { error in
-                                    guard error == nil else {
-                                        completion(error)
-                                        return
-                                    }
-                                    self.settingsManager.purgeHistoricalSettingsObjects(completion: completion)
-                                }
+                                self.settingsManager.purgeHistoricalSettingsObjects(completion: completion)
                             }
                         }
                     }

Loop/View Controllers/InsulinDeliveryTableViewController.swift

@@ -362,37 +362,35 @@ public final class InsulinDeliveryTableViewController: UITableViewController {
         }
 
         let sheet = UIAlertController(deleteAllConfirmationMessage: confirmMessage) {
-            self.deleteAllObjects()
+            Task {
+                await self.deleteAllObjects()
+            }
         }
         present(sheet, animated: true)
     }
 
     private var deletionPending = false
 
-    private func deleteAllObjects() {
+    private func deleteAllObjects() async {
         guard !deletionPending else {
             return
         }
 
         deletionPending = true
 
-        let completion = { (_: DoseStore.DoseStoreError?) -> Void in
-            DispatchQueue.main.async {
-                self.deletionPending = false
-                self.setEditing(false, animated: true)
-            }
-        }
-
         let sinceDate = Date().addingTimeInterval(-InsulinDeliveryTableViewController.historicDataDisplayTimeInterval)
 
         switch DataSourceSegment(rawValue: dataSourceSegmentedControl.selectedSegmentIndex)! {
         case .reservoir:
-            doseStore?.deleteAllReservoirValues(completion)
+            try? await doseStore?.deleteAllReservoirValues()
         case .history:
-            doseStore?.deleteAllPumpEvents(completion)
+            try? await doseStore?.deleteAllPumpEvents()
         case .manualEntryDose:
-            doseStore?.deleteAllManuallyEnteredDoses(since: sinceDate, completion)
+            try? await doseStore?.deleteAllManuallyEnteredDoses(since: sinceDate)
         }
+        self.deletionPending = false
+        self.setEditing(false, animated: true)
+
     }
 
     // MARK: - Table view data source

LoopTests/ViewModels/BolusEntryViewModelTests.swift

@@ -189,7 +189,7 @@ class BolusEntryViewModelTests: XCTestCase {
 
     func testUpdatePredictedGlucoseValues() async throws {
         do {
-            let input = try await delegate.fetchData(for: Self.exampleStartDate, disablingPreMeal: false)
+            let input = try await delegate.fetchData(for: Self.exampleStartDate, disablingPreMeal: false, ensureDosingCoverageStart: nil)
             let prediction = try input.predictGlucose()
             await bolusEntryViewModel.update()
             XCTAssertEqual(prediction, bolusEntryViewModel.predictedGlucoseValues.map { PredictedGlucoseValue(startDate: $0.startDate, quantity: $0.quantity) })
@@ -200,7 +200,7 @@ class BolusEntryViewModelTests: XCTestCase {
 
     func testUpdatePredictedGlucoseValuesWithManual() async throws {
         do {
-            let input = try await delegate.fetchData(for: Self.exampleStartDate, disablingPreMeal: false)
+            let input = try await delegate.fetchData(for: Self.exampleStartDate, disablingPreMeal: false, ensureDosingCoverageStart: nil)
             let prediction = try input.predictGlucose()
             await bolusEntryViewModel.update()
             bolusEntryViewModel.manualGlucoseQuantity = Self.exampleManualGlucoseQuantity
@@ -870,7 +870,7 @@ fileprivate class MockBolusEntryViewModelDelegate: BolusEntryViewModelDelegate {
         automaticBolusApplicationFactor: 0.4
     )
 
-    func fetchData(for baseTime: Date, disablingPreMeal: Bool) async throws -> StoredDataAlgorithmInput {
+    func fetchData(for baseTime: Date, disablingPreMeal: Bool, ensureDosingCoverageStart: Date?) async throws -> StoredDataAlgorithmInput {
         loopStateInput.predictionStart = baseTime
         return loopStateInput
     }