Просмотр исходного кода

Merge branch 'tdd' of https://github.com/nightscout/Trio-dev into currentTDDForOref

polscm32 1 год назад
Родитель
Сommit
9dd6f5b31f

+ 1 - 1
Trio/Sources/APS/Storage/TDDStorage.swift

@@ -87,7 +87,7 @@ final class BaseTDDStorage: TDDStorage, Injectable {
         async let weightedAverage = calculateWeightedAverage()
 
         // Await all concurrent calculations
-        let (hours, bolus, scheduled, temp, weighted) = await (
+        let (hours, bolus, scheduled, temp, weighted) = try await (
             pumpDataHours,
             bolusInsulin,
             scheduledBasalInsulin,

+ 2 - 1
Trio/Sources/Services/LiveActivity/Data/DataManager.swift

@@ -24,7 +24,8 @@ extension LiveActivityBridge {
             }
         }
     }
-
+ 
+    // TODO: extract logic or at least rename function appropiately
     func fetchAndMapDetermination() async throws -> DeterminationData? {
         let results = try await CoreDataStack.shared.fetchEntitiesAsync(
             ofType: OrefDetermination.self,