LOOP-4752 Integrate stateless algorithm into Loop (#606)

* Start work on new LoopDataManager using stateless algorithm

* Fetching data for new ldm

* LoopDosingManager

* Fix method parameter names

* LoopDosingManager handling automatic dosing

* Consolidating presets management into TemporaryPresetsManager

* Presets consolidation

* Reorg back to LoopDataManager

* Main status table view updates

* Bolus view fetching algo input

* Fix iob graph issue

* Get active carb values for graph time frame

* Notify on update of settings

* Fix carb display and edit

* Update active insulin and active carbs in bolus entry view

* Restore active preset, and add note about premeal. Always confirm override deactivation.

* Refactoring

* Mocking for simplifying DeviceDataManagerTests

* Fixing more tests

* LoopDataManager tests all passing

* Fixing tests

* Meal detection manager tests

* Update remote recommendations

* TemporaryPresetsManagerTests

* BolusEntryView use recommendManualBolus

* Add tests for max iob

* Cleanup

* Cleanup

* LoopSettingsTests were just overrides tests, and have been moved to TemporaryPresetsManagerTests

* Get active insulin from loop display state

* Update from PR feedback

* Assert DeviceDataManager triggers alert upload

* Remove unused method

* Guard against missing glucose

Author: ps2

Common/Models/LoopSettingsUserInfo.swift

@@ -6,10 +6,67 @@
 //
 
 import LoopCore
+import LoopKit
 
+struct LoopSettingsUserInfo: Equatable {
+    var loopSettings: LoopSettings
+    var scheduleOverride: TemporaryScheduleOverride?
+    var preMealOverride: TemporaryScheduleOverride?
+
+    public mutating func enablePreMealOverride(at date: Date = Date(), for duration: TimeInterval) {
+        preMealOverride = makePreMealOverride(beginningAt: date, for: duration)
+    }
+
+    private func makePreMealOverride(beginningAt date: Date = Date(), for duration: TimeInterval) -> TemporaryScheduleOverride? {
+        guard let preMealTargetRange = loopSettings.preMealTargetRange else {
+            return nil
+        }
+        return TemporaryScheduleOverride(
+            context: .preMeal,
+            settings: TemporaryScheduleOverrideSettings(targetRange: preMealTargetRange),
+            startDate: date,
+            duration: .finite(duration),
+            enactTrigger: .local,
+            syncIdentifier: UUID()
+        )
+    }
+
+    public mutating func clearOverride(matching context: TemporaryScheduleOverride.Context? = nil) {
+        if context == .preMeal {
+            preMealOverride = nil
+            return
+        }
+
+        guard let scheduleOverride = scheduleOverride else { return }
+
+        if let context = context {
+            if scheduleOverride.context == context {
+                self.scheduleOverride = nil
+            }
+        } else {
+            self.scheduleOverride = nil
+        }
+    }
+
+    public func nonPreMealOverrideEnabled(at date: Date = Date()) -> Bool {
+        return scheduleOverride?.isActive(at: date) == true
+    }
+
+    public mutating func legacyWorkoutOverride(beginningAt date: Date = Date(), for duration: TimeInterval) -> TemporaryScheduleOverride? {
+        guard let legacyWorkoutTargetRange = loopSettings.legacyWorkoutTargetRange else {
+            return nil
+        }
+
+        return TemporaryScheduleOverride(
+            context: .legacyWorkout,
+            settings: TemporaryScheduleOverrideSettings(targetRange: legacyWorkoutTargetRange),
+            startDate: date,
+            duration: duration.isInfinite ? .indefinite : .finite(duration),
+            enactTrigger: .local,
+            syncIdentifier: UUID()
+        )
+    }
 
-struct LoopSettingsUserInfo {
-    let settings: LoopSettings
 }
 
 
@@ -23,19 +80,36 @@ extension LoopSettingsUserInfo: RawRepresentable {
         guard rawValue["v"] as? Int == LoopSettingsUserInfo.version,
             rawValue["name"] as? String == LoopSettingsUserInfo.name,
             let settingsRaw = rawValue["s"] as? LoopSettings.RawValue,
-            let settings = LoopSettings(rawValue: settingsRaw)
+            let loopSettings = LoopSettings(rawValue: settingsRaw)
         else {
             return nil
         }
 
-        self.settings = settings
+        self.loopSettings = loopSettings
+
+        if let rawScheduleOverride = rawValue["o"] as? TemporaryScheduleOverride.RawValue {
+            self.scheduleOverride = TemporaryScheduleOverride(rawValue: rawScheduleOverride)
+        } else {
+            self.scheduleOverride = nil
+        }
+
+        if let rawPreMealOverride = rawValue["p"] as? TemporaryScheduleOverride.RawValue {
+            self.preMealOverride = TemporaryScheduleOverride(rawValue: rawPreMealOverride)
+        } else {
+            self.preMealOverride = nil
+        }
     }
 
     var rawValue: RawValue {
-        return [
+        var raw: RawValue = [
             "v": LoopSettingsUserInfo.version,
             "name": LoopSettingsUserInfo.name,
-            "s": settings.rawValue
+            "s": loopSettings.rawValue
         ]
+
+        raw["o"] = scheduleOverride?.rawValue
+        raw["p"] = preMealOverride?.rawValue
+
+        return raw
     }
 }

Loop.xcodeproj/project.pbxproj

@@ -22,9 +22,14 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, WindowProvider {
 
         setenv("CFNETWORK_DIAGNOSTICS", "3", 1)
 
-        loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
-        loopAppManager.launch()
-        return loopAppManager.isLaunchComplete
+        // Avoid doing full initialization when running tests
+        if ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil {
+            loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
+            loopAppManager.launch()
+            return loopAppManager.isLaunchComplete
+        } else {
+            return true
+        }
     }
 
     // MARK: - UIApplicationDelegate - Life Cycle

Loop/AppDelegate.swift

@@ -10,7 +10,7 @@ import LoopKit
 import LoopCore
 
 extension PumpManagerStatus.BasalDeliveryState {
-    func getNetBasal(basalSchedule: BasalRateSchedule, settings: LoopSettings) -> NetBasal? {
+    func getNetBasal(basalSchedule: BasalRateSchedule, maximumBasalRatePerHour: Double?) -> NetBasal? {
         func scheduledBasal(for date: Date) -> AbsoluteScheduleValue<Double>? {
             return basalSchedule.between(start: date, end: date).first
         }
@@ -20,7 +20,7 @@ extension PumpManagerStatus.BasalDeliveryState {
             if let scheduledBasal = scheduledBasal(for: dose.startDate) {
                 return NetBasal(
                     lastTempBasal: dose,
-                    maxBasal: settings.maximumBasalRatePerHour,
+                    maxBasal: maximumBasalRatePerHour,
                     scheduledBasal: scheduledBasal
                 )
             } else {
@@ -30,7 +30,7 @@ extension PumpManagerStatus.BasalDeliveryState {
             if let scheduledBasal = scheduledBasal(for: date) {
                 return NetBasal(
                     suspendedAt: date,
-                    maxBasal: settings.maximumBasalRatePerHour,
+                    maxBasal: maximumBasalRatePerHour,
                     scheduledBasal: scheduledBasal
                 )
             } else {

Loop/Extensions/BasalDeliveryState.swift

@@ -41,16 +41,16 @@ extension DeviceDataManager {
         } else if pumpManager == nil {
             return DeviceDataManager.addPumpStatusHighlight
         } else {
-            return pumpManager?.pumpStatusHighlight
+            return (pumpManager as? PumpManagerUI)?.pumpStatusHighlight
         }
     }
 
     var pumpStatusBadge: DeviceStatusBadge? {
-        return pumpManager?.pumpStatusBadge
+        return (pumpManager as? PumpManagerUI)?.pumpStatusBadge
     }
 
     var pumpLifecycleProgress: DeviceLifecycleProgress? {
-        return pumpManager?.pumpLifecycleProgress
+        return (pumpManager as? PumpManagerUI)?.pumpLifecycleProgress
     }
 
     static var resumeOnboardingStatusHighlight: ResumeOnboardingStatusHighlight {
@@ -104,18 +104,12 @@ extension DeviceDataManager {
             let action = pumpManagerHUDProvider.didTapOnHUDView(view, allowDebugFeatures: FeatureFlags.allowDebugFeatures)
         {
             return action
-        } else if let pumpManager = pumpManager {
+        } else if let pumpManager = pumpManager as? PumpManagerUI {
             return .presentViewController(pumpManager.settingsViewController(bluetoothProvider: bluetoothProvider, colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures, allowedInsulinTypes: allowedInsulinTypes))
         } else {
             return .setupNewPump
         }
-    }
-    
-    var isGlucoseValueStale: Bool {
-        guard let latestGlucoseDataDate = glucoseStore.latestGlucose?.startDate else { return true }
-
-        return Date().timeIntervalSince(latestGlucoseDataDate) > LoopAlgorithm.inputDataRecencyInterval
-    }
+    }    
 }
 
 // MARK: - BluetoothState

Loop/Extensions/DeviceDataManager+BolusEntryViewModelDelegate.swift

@@ -154,9 +154,7 @@ fileprivate extension StoredSettings {
                               glucoseTargetRangeSchedule: glucoseTargetRangeSchedule,
                               preMealTargetRange: DoubleRange(minValue: 80.0, maxValue: 90.0).quantityRange(for: .milligramsPerDeciliter),
                               workoutTargetRange: DoubleRange(minValue: 150.0, maxValue: 160.0).quantityRange(for: .milligramsPerDeciliter),
-                              overridePresets: nil,
-                              scheduleOverride: nil,
-                              preMealOverride: preMealOverride,
+                              overridePresets: [],
                               maximumBasalRatePerHour: 3.5,
                               maximumBolus: 10.0,
                               suspendThreshold: GlucoseThreshold(unit: .milligramsPerDeciliter, value: 75.0),

Loop/Extensions/DeviceDataManager+DeviceStatus.swift

@@ -37,7 +37,7 @@ extension UIDevice {
 }
 
 extension UIDevice {
-    func generateDiagnosticReport(_ completion: @escaping (_ report: String) -> Void) {
+    func generateDiagnosticReport() -> String {
         var report: [String] = [
             "## Device",
             "",
@@ -53,7 +53,7 @@ extension UIDevice {
                 "* batteryState: \(String(describing: batteryState))",
             ]
         }
-        completion(report.joined(separator: "\n"))
+        return report.joined(separator: "\n")
     }
 }