Use LoopAlgorithm basal overlay for computing total delivery (#700)

Author: ps2

Loop/Managers/LoopDataManager.swift

@@ -276,18 +276,27 @@ final class LoopDataManager: ObservableObject {
 
     func fetchData(
         for baseTime: Date = Date(),
-        disablingPreMeal: Bool = false
+        disablingPreMeal: Bool = false,
+        ensureDosingCoverageStart: Date? = nil
     ) async throws -> StoredDataAlgorithmInput {
         // Need to fetch doses back as far as t - (DIA + DCA) for Dynamic carbs
         let dosesInputHistory = CarbMath.maximumAbsorptionTimeInterval + InsulinMath.defaultInsulinActivityDuration
 
         var dosesStart = baseTime.addingTimeInterval(-dosesInputHistory)
+
+        // Ensure dosing data goes back before ensureDosingCoverageStart, if specified
+        if let ensureDosingCoverageStart {
+            dosesStart = min(ensureDosingCoverageStart, dosesStart)
+        }
+
         let doses = try await doseStore.getNormalizedDoseEntries(
             start: dosesStart,
             end: baseTime
         )
 
-        dosesStart = doses.map { $0.startDate }.min() ?? dosesStart
+        // Doses that were included because they cover dosesStart might have a start time earlier than dosesStart
+        // This moves the start time back to ensure basal covers
+        dosesStart = min(dosesStart, doses.map { $0.startDate }.min() ?? dosesStart)
 
         let basal = try await settingsProvider.getBasalHistory(startDate: dosesStart, endDate: baseTime)
 
@@ -411,7 +420,9 @@ final class LoopDataManager: ObservableObject {
     func updateDisplayState() async {
         var newState = AlgorithmDisplayState()
         do {
-            var input = try await fetchData(for: now())
+            let midnight = Calendar.current.startOfDay(for: Date())
+
+            var input = try await fetchData(for: now(), ensureDosingCoverageStart: midnight)
             input.recommendationType = .manualBolus
             newState.input = input
             newState.output = LoopAlgorithm.run(input: input)
@@ -598,6 +609,24 @@ final class LoopDataManager: ObservableObject {
         }
     }
 
+    public func totalDeliveredToday() async -> InsulinValue?
+    {
+        guard let data = displayState.input else {
+            return nil
+        }
+
+        let now = data.predictionStart
+        let midnight = Calendar.current.startOfDay(for: now)
+
+        let annotatedDoses = data.doses.annotated(with: data.basal, fillBasalGaps: true)
+        let trimmed = annotatedDoses.map { $0.trimmed(from: midnight, to: now)}
+
+        return InsulinValue(
+            startDate: midnight,
+            value: trimmed.reduce(0.0) { $0 + $1.volume }
+        )
+    }
+
     var iobValues: [InsulinValue] {
         dosesRelativeToBasal.insulinOnBoardTimeline()
     }
@@ -1123,7 +1152,7 @@ extension LoopDataManager: SimpleBolusViewModelDelegate {
 
 }
 
-extension LoopDataManager: BolusEntryViewModelDelegate {
+extension LoopDataManager: BolusEntryViewModelDelegate {    
     func saveGlucose(sample: LoopKit.NewGlucoseSample) async throws -> LoopKit.StoredGlucoseSample {
         let storedSamples = try await addGlucose([sample])
         return storedSamples.first!

Loop/Managers/Store Protocols/DoseStoreProtocol.swift

@@ -17,8 +17,6 @@ protocol DoseStoreProtocol: AnyObject {
 
     var lastReservoirValue: ReservoirValue? { get }
 
-    func getTotalUnitsDelivered(since startDate: Date) async throws -> InsulinValue
-
     var lastAddedPumpData: Date { get }
 }
 

Loop/View Controllers/InsulinDeliveryTableViewController.swift

@@ -320,9 +320,7 @@ public final class InsulinDeliveryTableViewController: UITableViewController {
     private func updateTotal() {
         Task { @MainActor in
             if case .display = state {
-                let midnight = Calendar.current.startOfDay(for: Date())
-
-                if let result = try? await doseStore?.getTotalUnitsDelivered(since: midnight) {
+                if let result = await loopDataManager.totalDeliveredToday() {
                     self.totalValueLabel.text = NumberFormatter.localizedString(from: NSNumber(value: result.value), number: .none)
                     self.totalDateLabel.text = String(format: NSLocalizedString("com.loudnate.InsulinKit.totalDateLabel", value: "since %1$@", comment: "The format string describing the starting date of a total value. The first format argument is the localized date."), DateFormatter.localizedString(from: result.startDate, dateStyle: .none, timeStyle: .short))
                 } else {

Loop/View Controllers/StatusTableViewController.swift

@@ -508,7 +508,7 @@ final class StatusTableViewController: LoopChartsTableViewController {
             doseEntries = loopManager.dosesRelativeToBasal.trimmed(from: startDate)
 
             iobValues = loopManager.iobValues.filterDateRange(startDate, nil)
-            totalDelivery = try? await loopManager.doseStore.getTotalUnitsDelivered(since: Calendar.current.startOfDay(for: Date())).value
+            totalDelivery = await loopManager.totalDeliveredToday()?.value
         }
 
         updatePresetModeAvailability(automaticDosingEnabled: automaticDosingEnabled)

Loop/View Models/BolusEntryViewModel.swift

@@ -27,7 +27,7 @@ protocol BolusEntryViewModelDelegate: AnyObject {
     var mostRecentGlucoseDataDate: Date? { get }
     var mostRecentPumpDataDate: Date? { get }
 
-    func fetchData(for baseTime: Date, disablingPreMeal: Bool) async throws -> StoredDataAlgorithmInput
+    func fetchData(for baseTime: Date, disablingPreMeal: Bool, ensureDosingCoverageStart: Date?) async throws -> StoredDataAlgorithmInput
     func effectiveGlucoseTargetRangeSchedule(presumingMealEntry: Bool) -> GlucoseRangeSchedule?
 
     func addCarbEntry(_ carbEntry: NewCarbEntry, replacing replacingEntry: StoredCarbEntry?) async throws -> StoredCarbEntry
@@ -515,7 +515,7 @@ final class BolusEntryViewModel: ObservableObject {
 
         do {
             let startDate = now()
-            var input = try await delegate.fetchData(for: startDate, disablingPreMeal: potentialCarbEntry != nil)
+            var input = try await delegate.fetchData(for: startDate, disablingPreMeal: potentialCarbEntry != nil, ensureDosingCoverageStart: nil)
 
             let insulinModel = delegate.insulinModel(for: deliveryDelegate?.pumpInsulinType)