Add bolusVolume to NS enacted struct

ps2 · Mar 26, 2022 · 31e5853 · 31e5853
1 parent 1e520fc
commit 31e5853
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/NightscoutServiceKit/Extensions/StoredDosingDecision.swift b/NightscoutServiceKit/Extensions/StoredDosingDecision.swift
@@ -61,11 +61,10 @@ extension StoredDosingDecision {
     }
 
     var loopStatusEnacted: LoopEnacted? {
-        guard case .some(.tempBasal(let tempBasal)) = pumpManagerStatus?.basalDeliveryState else {
+        guard let automaticDoseRecommendation = automaticDoseRecommendation, errors.isEmpty, let tempBasal = automaticDoseRecommendation.basalAdjustment else {
             return nil
         }
-        let duration = tempBasal.endDate.timeIntervalSince(tempBasal.startDate)
-        return LoopEnacted(rate: tempBasal.unitsPerHour, duration: duration, timestamp: tempBasal.startDate, received: true)
+        return LoopEnacted(rate: tempBasal.unitsPerHour, duration: tempBasal.duration, timestamp: date, received: true, bolusVolume: automaticDoseRecommendation.bolusUnits ?? 0)
     }
 
     var loopStatusFailureReason: String? {