Updates for HealthKit decoupling changes in LoopKit

ps2 · ps2 · commit 1679eb105321 · 2023-05-22T23:11:16.000-05:00
diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift
@@ -84,20 +84,12 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         expireAfter: localCacheDuration)
 
     lazy var glucoseStore = GlucoseStore(
-        healthStore: healthStore,
-        observeHealthKitSamplesFromOtherApps: FeatureFlags.observeHealthKitGlucoseSamplesFromOtherApps,
-        storeSamplesToHealthKit: false,
         cacheStore: cacheStore,
-        observationEnabled: false,
         provenanceIdentifier: HKSource.default().bundleIdentifier
     )
 
     lazy var doseStore = DoseStore(
-        healthStore: healthStore,
-        observeHealthKitSamplesFromOtherApps: FeatureFlags.observeHealthKitDoseSamplesFromOtherApps,
-        storeSamplesToHealthKit: false,
         cacheStore: cacheStore,
-        observationEnabled: false,
         insulinModelProvider: PresetInsulinModelProvider(defaultRapidActingModel: settingsStore.latestSettings?.defaultRapidActingModel?.presetForRapidActingInsulin),
         longestEffectDuration: ExponentialInsulinModelPreset.rapidActingAdult.effectDuration,
         basalProfile: settingsStore.latestSettings?.basalRateSchedule,
diff --git a/Loop/Extensions/DeviceDataManager+BolusEntryViewModelDelegate.swift b/Loop/Extensions/DeviceDataManager+BolusEntryViewModelDelegate.swift
@@ -70,7 +70,7 @@ extension DeviceDataManager: BolusEntryViewModelDelegate, ManualDoseViewModelDel
     }
     
     var preferredGlucoseUnit: HKUnit {
-        return glucoseStore.preferredUnit ?? .milligramsPerDeciliter
+        return displayGlucoseUnitObservable.displayGlucoseUnit
     }
     
     var pumpInsulinType: InsulinType? {
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
@@ -163,13 +163,13 @@ final class DeviceDataManager {
         var readTypes: Set<HKSampleType> = []
 
         if FeatureFlags.observeHealthKitCarbSamplesFromOtherApps {
-            readTypes.insert(carbStore.sampleType)
+            readTypes.insert(HealthKitSampleStore.carbType)
         }
         if FeatureFlags.observeHealthKitDoseSamplesFromOtherApps {
-            readTypes.insert(doseStore.sampleType)
+            readTypes.insert(HealthKitSampleStore.insulinQuantityType)
         }
         if FeatureFlags.observeHealthKitGlucoseSamplesFromOtherApps {
-            readTypes.insert(glucoseStore.sampleType)
+            readTypes.insert(HealthKitSampleStore.glucoseType)
         }
 
         readTypes.insert(HKObjectType.categoryType(forIdentifier: HKCategoryTypeIdentifier.sleepAnalysis)!)
@@ -180,35 +180,35 @@ final class DeviceDataManager {
     /// All the HealthKit types to be shared by stores
     private var shareTypes: Set<HKSampleType> {
         return Set([
-            glucoseStore.sampleType,
-            carbStore.sampleType,
-            doseStore.sampleType,
+            HealthKitSampleStore.glucoseType,
+            HealthKitSampleStore.carbType,
+            HealthKitSampleStore.insulinQuantityType,
         ])
     }
 
     var sleepDataAuthorizationRequired: Bool {
-        return carbStore.healthStore.authorizationStatus(for: HKObjectType.categoryType(forIdentifier: HKCategoryTypeIdentifier.sleepAnalysis)!) == .notDetermined
+        return healthStore.authorizationStatus(for: HKObjectType.categoryType(forIdentifier: HKCategoryTypeIdentifier.sleepAnalysis)!) == .notDetermined
     }
     
     var sleepDataSharingDenied: Bool {
-        return carbStore.healthStore.authorizationStatus(for: HKObjectType.categoryType(forIdentifier: HKCategoryTypeIdentifier.sleepAnalysis)!) == .sharingDenied
+        return healthStore.authorizationStatus(for: HKObjectType.categoryType(forIdentifier: HKCategoryTypeIdentifier.sleepAnalysis)!) == .sharingDenied
     }
 
     /// True if any stores require HealthKit authorization
     var authorizationRequired: Bool {
-        return glucoseStore.authorizationRequired ||
-        carbStore.authorizationRequired ||
-        doseStore.authorizationRequired ||
-        sleepDataAuthorizationRequired
+        return healthStore.authorizationStatus(for: HealthKitSampleStore.glucoseType) == .notDetermined ||
+               healthStore.authorizationStatus(for: HealthKitSampleStore.carbType) == .notDetermined ||
+               healthStore.authorizationStatus(for: HealthKitSampleStore.insulinQuantityType) == .notDetermined ||
+               sleepDataAuthorizationRequired
     }
 
     /// True if the user has explicitly denied access to any stores' HealthKit types
-    private var sharingDenied: Bool {
-        return glucoseStore.sharingDenied ||
-        carbStore.sharingDenied ||
-        doseStore.sharingDenied ||
-        sleepDataSharingDenied
-    }
+//    private var sharingDenied: Bool {
+//        return healthStore.authorizationStatus(for: HealthKitSampleStore.glucoseType) == .sharingDenied ||
+//        carbStore.sharingDenied ||
+//        doseStore.sharingDenied ||
+//        sleepDataSharingDenied
+//    }
 
     // MARK: Services
 
@@ -277,14 +277,19 @@ final class DeviceDataManager {
 
         let absorptionTimes = LoopCoreConstants.defaultCarbAbsorptionTimes
         let sensitivitySchedule = settingsManager.latestSettings.insulinSensitivitySchedule
-        
-        self.carbStore = CarbStore(
+
+        let carbHealthStore = HealthKitSampleStore(
             healthStore: healthStore,
             observeHealthKitSamplesFromOtherApps: FeatureFlags.observeHealthKitCarbSamplesFromOtherApps, // At some point we should let the user decide which apps they would like to import from.
+            type: HealthKitSampleStore.carbType,
+            observationStart: Date().addingTimeInterval(-absorptionTimes.slow * 2)
+        )
+        
+        self.carbStore = CarbStore(
+            healthKitSampleStore: carbHealthStore,
             cacheStore: cacheStore,
             cacheLength: localCacheDuration,
             defaultAbsorptionTimes: absorptionTimes,
-            observationInterval: absorptionTimes.slow * 2,
             carbRatioSchedule: settingsManager.latestSettings.carbRatioSchedule,
             insulinSensitivitySchedule: sensitivitySchedule,
             overrideHistory: overrideHistory,
@@ -300,10 +305,16 @@ final class DeviceDataManager {
         }
 
         self.analyticsServicesManager = analyticsServicesManager
-        
-        self.doseStore = DoseStore(
+
+        let insulinHealthStore = HealthKitSampleStore(
             healthStore: healthStore,
             observeHealthKitSamplesFromOtherApps: FeatureFlags.observeHealthKitDoseSamplesFromOtherApps,
+            type: HealthKitSampleStore.insulinQuantityType,
+            observationStart: Date().addingTimeInterval(-absorptionTimes.slow * 2)
+        )
+
+        self.doseStore = DoseStore(
+            healthKitSampleStore: insulinHealthStore,
             cacheStore: cacheStore,
             cacheLength: localCacheDuration,
             insulinModelProvider: insulinModelProvider,
@@ -314,13 +325,18 @@ final class DeviceDataManager {
             lastPumpEventsReconciliation: nil, // PumpManager is nil at this point. Will update this via addPumpEvents below
             provenanceIdentifier: HKSource.default().bundleIdentifier
         )
+
+        let glucoseHealthStore = HealthKitSampleStore(
+            healthStore: healthStore,
+            observeHealthKitSamplesFromOtherApps:  FeatureFlags.observeHealthKitGlucoseSamplesFromOtherApps,
+            type: HealthKitSampleStore.glucoseType,
+            observationStart: Date().addingTimeInterval(-.hours(24))
+        )
         
         self.glucoseStore = GlucoseStore(
-            healthStore: healthStore,
-            observeHealthKitSamplesFromOtherApps: FeatureFlags.observeHealthKitGlucoseSamplesFromOtherApps,
+            healthKitSampleStore: glucoseHealthStore,
             cacheStore: cacheStore,
             cacheLength: localCacheDuration,
-            observationInterval: .hours(24),
             provenanceIdentifier: HKSource.default().bundleIdentifier
         )
         
@@ -334,7 +350,7 @@ final class DeviceDataManager {
         self.automaticDosingStatus = automaticDosingStatus
 
         // HealthStorePreferredGlucoseUnitDidChange will be notified once the user completes the health access form. Set to .milligramsPerDeciliter until then
-        displayGlucoseUnitObservable = DisplayGlucoseUnitObservable(displayGlucoseUnit: glucoseStore.preferredUnit ?? .milligramsPerDeciliter)
+        displayGlucoseUnitObservable = DisplayGlucoseUnitObservable(displayGlucoseUnit: .milligramsPerDeciliter)
 
         self.trustedTimeChecker = trustedTimeChecker
 
@@ -438,14 +454,16 @@ final class DeviceDataManager {
             .assign(to: \.automaticDosingStatus.isAutomaticDosingAllowed, on: self)
             .store(in: &cancellables)
 
-        NotificationCenter.default.addObserver(forName: .HealthStorePreferredGlucoseUnitDidChange, object: glucoseStore.healthStore, queue: nil) { [weak self] _ in
-            guard let strongSelf = self else {
+        NotificationCenter.default.addObserver(forName: .HealthStorePreferredGlucoseUnitDidChange, object: healthStore, queue: nil) { [weak self] _ in
+            guard let self else {
                 return
             }
 
-            if let preferredGlucoseUnit = strongSelf.glucoseStore.preferredUnit {
-                strongSelf.displayGlucoseUnitObservable.displayGlucoseUnitDidChange(to: preferredGlucoseUnit)
-                strongSelf.notifyObserversOfDisplayGlucoseUnitChange(to: preferredGlucoseUnit)
+            Task {
+                if let unit = await self.healthStore.cachedPreferredUnits(for: .bloodGlucose) {
+                    self.displayGlucoseUnitObservable.displayGlucoseUnitDidChange(to: unit)
+                    self.notifyObserversOfDisplayGlucoseUnitChange(to: unit)
+                }
             }
         }
     }
@@ -644,9 +662,9 @@ final class DeviceDataManager {
         healthStore.requestAuthorization(toShare: shareTypes, read: readTypes) { (success, error) in
             if success {
                 // Call the individual authorization methods to trigger query creation
-                self.carbStore.authorize(toShare: true, read: FeatureFlags.observeHealthKitCarbSamplesFromOtherApps, { _ in })
-                self.doseStore.insulinDeliveryStore.authorize(toShare: true, read: FeatureFlags.observeHealthKitDoseSamplesFromOtherApps, { _ in })
-                self.glucoseStore.authorize(toShare: true, read: FeatureFlags.observeHealthKitGlucoseSamplesFromOtherApps, { _ in })
+                self.carbStore.hkSampleStore?.authorizationIsDetermined()
+                self.doseStore.hkSampleStore?.authorizationIsDetermined()
+                self.glucoseStore.hkSampleStore?.authorizationIsDetermined()
             }
 
             self.getHealthStoreAuthorization(completion)
@@ -1212,7 +1230,8 @@ extension DeviceDataManager {
                 return
             }
 
-            guard !self.doseStore.sharingDenied else {
+            let insulinSharingDenied = self.healthStore.authorizationStatus(for: HealthKitSampleStore.insulinQuantityType) == .sharingDenied
+            guard !insulinSharingDenied else {
                 // only clear cache since access to health kit is denied
                 insulinDeliveryStore.purgeCachedInsulinDeliveryObjects() { error in
                     completion?(error)
@@ -1232,7 +1251,8 @@ extension DeviceDataManager {
             return
         }
         
-        guard !glucoseStore.sharingDenied else {
+        let glucoseSharingDenied = self.healthStore.authorizationStatus(for: HealthKitSampleStore.glucoseType) == .sharingDenied
+        guard !glucoseSharingDenied else {
             // only clear cache since access to health kit is denied
             glucoseStore.purgeCachedGlucoseObjects() { error in
                 completion?(error)
@@ -1673,10 +1693,8 @@ extension DeviceDataManager {
     func addDisplayGlucoseUnitObserver(_ observer: DisplayGlucoseUnitObserver) {
         let queue = DispatchQueue.main
         displayGlucoseUnitObservers.insert(observer, queue: queue)
-        if let displayGlucoseUnit = glucoseStore.preferredUnit {
-            queue.async {
-                observer.displayGlucoseUnitDidChange(to: displayGlucoseUnit)
-            }
+        queue.async {
+            observer.displayGlucoseUnitDidChange(to: self.displayGlucoseUnitObservable.displayGlucoseUnit)
         }
     }
 
diff --git a/Loop/Managers/ExtensionDataManager.swift b/Loop/Managers/ExtensionDataManager.swift
@@ -61,11 +61,7 @@ final class ExtensionDataManager {
     }
     
     private func update() {
-        guard let unit = (deviceManager.glucoseStore.preferredUnit ?? ExtensionDataManager.context?.predictedGlucose?.unit) else {
-            return
-        }
-
-        createStatusContext(glucoseUnit: unit) { (context) in
+        createStatusContext(glucoseUnit:  deviceManager.preferredGlucoseUnit) { (context) in
             if let context = context {
                 ExtensionDataManager.context = context
             }
diff --git a/Loop/Managers/Store Protocols/CarbStoreProtocol.swift b/Loop/Managers/Store Protocols/CarbStoreProtocol.swift
@@ -11,8 +11,6 @@ import HealthKit
 
 protocol CarbStoreProtocol: AnyObject {
     
-    var sampleType: HKSampleType { get }
-    
     var preferredUnit: HKUnit! { get }
     
     var delegate: CarbStoreDelegate? { get set }
@@ -32,13 +30,6 @@ protocol CarbStoreProtocol: AnyObject {
     
     var defaultAbsorptionTimes: CarbStore.DefaultAbsorptionTimes { get }
     
-    // MARK: HealthKit
-    var authorizationRequired: Bool { get }
-    
-    var sharingDenied: Bool { get }
-    
-    func authorize(toShare: Bool, read: Bool, _ completion: @escaping (_ result: HealthKitSampleStoreResult<Bool>) -> Void)
-    
     // MARK: Data Management
     func replaceCarbEntry(_ oldEntry: StoredCarbEntry, withEntry newEntry: NewCarbEntry, completion: @escaping (_ result: CarbStoreResult<StoredCarbEntry>) -> Void)
     
diff --git a/Loop/Managers/Store Protocols/DoseStoreProtocol.swift b/Loop/Managers/Store Protocols/DoseStoreProtocol.swift
@@ -21,18 +21,11 @@ protocol DoseStoreProtocol: AnyObject {
     
     var basalProfileApplyingOverrideHistory: BasalRateSchedule? { get }
     
-    // MARK: authorization
-    var authorizationRequired: Bool { get }
-    
-    var sharingDenied: Bool { get }
-    
     // MARK: store information
     var lastReservoirValue: LoopKit.ReservoirValue? { get }
     
     var lastAddedPumpData: Date { get }
     
-    var sampleType: HKSampleType { get }
-    
     var delegate: DoseStoreDelegate? { get set }
     
     var device: HKDevice? { get set }
diff --git a/Loop/Managers/Store Protocols/GlucoseStoreProtocol.swift b/Loop/Managers/Store Protocols/GlucoseStoreProtocol.swift
@@ -13,21 +13,10 @@ protocol GlucoseStoreProtocol: AnyObject {
     
     var latestGlucose: GlucoseSampleValue? { get }
     
-    var preferredUnit: HKUnit? { get }
-    
-    var sampleType: HKSampleType { get }
-    
     var delegate: GlucoseStoreDelegate? { get set }
     
     var managedDataInterval: TimeInterval? { get set }
     
-    // MARK: HealthKit
-    var authorizationRequired: Bool { get }
-    
-    var sharingDenied: Bool { get }
-
-    func authorize(toShare: Bool, read: Bool, _ completion: @escaping (_ result: HealthKitSampleStoreResult<Bool>) -> Void)
-    
     // MARK: Sample Management
     func addGlucoseSamples(_ samples: [NewGlucoseSample], completion: @escaping (_ result: Result<[StoredGlucoseSample], Error>) -> Void)
     
diff --git a/Loop/Managers/WatchDataManager.swift b/Loop/Managers/WatchDataManager.swift
@@ -245,7 +245,7 @@ final class WatchDataManager: NSObject {
 
             let carbsOnBoard = state.carbsOnBoard
 
-            let context = WatchContext(glucose: glucose, glucoseUnit: self.deviceManager.glucoseStore.preferredUnit)
+            let context = WatchContext(glucose: glucose, glucoseUnit: self.deviceManager.preferredGlucoseUnit)
             context.reservoir = reservoir?.unitVolume
             context.loopLastRunDate = manager.lastLoopCompleted
             context.cob = carbsOnBoard?.quantity.doubleValue(for: HKUnit.gram())
diff --git a/StatusWidget/StatusWidget.swift b/StatusWidget/StatusWidget.swift
@@ -31,11 +31,7 @@ class StatusWidgetProvider: TimelineProvider {
         expireAfter: localCacheDuration)
 
     lazy var glucoseStore = GlucoseStore(
-        healthStore: healthStore,
-        observeHealthKitSamplesFromOtherApps: FeatureFlags.observeHealthKitGlucoseSamplesFromOtherApps,
-        storeSamplesToHealthKit: false,
         cacheStore: cacheStore,
-        observationEnabled: false,
         provenanceIdentifier: HKSource.default().bundleIdentifier
     )
 
@@ -112,26 +108,30 @@ class StatusWidgetProvider: TimelineProvider {
             }
             group.leave()
         }
-        group.notify(queue: .main) {
+        group.wait()
+
+        let finalGlucose = glucose
+
+        Task { @MainActor in
             guard let defaults = self.defaults,
                   let context = defaults.statusExtensionContext,
                   let contextUpdatedAt = context.createdAt,
-                  let unit = self.glucoseStore.preferredUnit
+                  let unit = await healthStore.cachedPreferredUnits(for: .bloodGlucose)
             else {
                 return
             }
-            
+
             let lastCompleted = context.lastLoopCompleted
-            
+
             let closeLoop = context.isClosedLoop ?? false
-            
+
             let netBasal = context.netBasal
-            
-            let currentGlucose = glucose.last
+
+            let currentGlucose = finalGlucose.last
             var previousGlucose: GlucoseValue?
 
-            if glucose.count > 1 {
-                previousGlucose = glucose[glucose.count - 2]
+            if finalGlucose.count > 1 {
+                previousGlucose = finalGlucose[finalGlucose.count - 2]
             }
 
             var delta: HKQuantity?
@@ -146,7 +146,7 @@ class StatusWidgetProvider: TimelineProvider {
             }
 
             let predictedGlucose = context.predictedGlucose?.samples
-            
+
             let eventualGlucose = predictedGlucose?.last
 
             let updateDate = Date()
diff --git a/WatchApp Extension/Managers/LoopDataManager.swift b/WatchApp Extension/Managers/LoopDataManager.swift

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ extension DeviceDataManager: BolusEntryViewModelDelegate, ManualDoseViewModelDel`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`var preferredGlucoseUnit: HKUnit {`
`73`		`- return glucoseStore.preferredUnit ?? .milligramsPerDeciliter`
	`73`	`+ return displayGlucoseUnitObservable.displayGlucoseUnit`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`var pumpInsulinType: InsulinType? {`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,7 @@ final class ExtensionDataManager {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private func update() {`
`64`		`- guard let unit = (deviceManager.glucoseStore.preferredUnit ?? ExtensionDataManager.context?.predictedGlucose?.unit) else {`
`65`		`- return`
`66`		`- }`
`67`		`-`
`68`		`- createStatusContext(glucoseUnit: unit) { (context) in`
	`64`	`+ createStatusContext(glucoseUnit: deviceManager.preferredGlucoseUnit) { (context) in`
`69`	`65`	`if let context = context {`
`70`	`66`	`ExtensionDataManager.context = context`
`71`	`67`	`}`