Fix bolus and carb entry analytics

Author: ps2

Loop/Managers/AnalyticsServicesManager.swift

@@ -164,16 +164,16 @@ final class AnalyticsServicesManager {
     }
 
 
-    func didAddCarbsFromWatch() {
-        logEvent("Carb entry created", withProperties: ["source" : "Watch"], outOfSession: true)
+    func didAddCarbs(source: String, amount: Double, inSession: Bool = false) {
+        logEvent("Carb entry created", withProperties: ["source" : source, "amount": "\(amount)"], outOfSession: inSession)
     }
 
     func didRetryBolus() {
         logEvent("Bolus Retry")
     }
 
-    func didSetBolusFromWatch(_ units: Double) {
-        logEvent("Bolus set", withProperties: ["source" : "Watch"], outOfSession: true)
+    func didBolus(source: String, units: Double, inSession: Bool = false) {
+        logEvent("Bolus set", withProperties: ["source" : source, "units": "\(units)"], outOfSession: true)
     }
 
     func didFetchNewCGMData() {

Loop/Managers/DeviceDataManager.swift

@@ -1485,6 +1485,7 @@ extension DeviceDataManager {
                 UIApplication.shared.endBackgroundTask(backgroundTask)
             }
             completion(result)
+            self.analyticsServicesManager.didAddCarbs(source: "Remote", amount: carbEntry.quantity.doubleValue(for: .gram()))
         }
     }
 
@@ -1503,6 +1504,7 @@ extension DeviceDataManager {
                 UIApplication.shared.endBackgroundTask(backgroundTask)
             }
             completion(error)
+            self.analyticsServicesManager.didBolus(source: "Remote", units: units)
         }
     }
 

Loop/Managers/WatchDataManager.swift

@@ -386,7 +386,7 @@ final class WatchDataManager: NSObject {
 
             deviceManager.enactBolus(units: bolus.value, activationType: bolus.activationType) { (error) in
                 if error == nil {
-                    self.deviceManager.analyticsServicesManager.didSetBolusFromWatch(bolus.value)
+                    self.deviceManager.analyticsServicesManager.didBolus(source: "Watch", units: bolus.value)
                 }
 
                 // When we've successfully started the bolus, send a new context with our new prediction
@@ -401,7 +401,7 @@ final class WatchDataManager: NSObject {
                 switch result {
                 case .success(let storedCarbEntry):
                     dosingDecision.carbEntry = storedCarbEntry
-                    self.deviceManager.analyticsServicesManager.didAddCarbsFromWatch()
+                    self.deviceManager.analyticsServicesManager.didAddCarbs(source: "Watch", amount: storedCarbEntry.quantity.doubleValue(for: .gram()))
                     enactBolus()
                 case .failure(let error):
                     self.log.error("%{public}@", String(describing: error))

Loop/View Controllers/CarbEntryViewController.swift

@@ -513,6 +513,8 @@ final class CarbEntryViewController: LoopChartsTableViewController, Identifiable
             await viewModel.generateRecommendationAndStartObserving()
         }
 
+        viewModel.analyticsServicesManager = deviceManager.analyticsServicesManager
+
         let bolusEntryView = BolusEntryView(viewModel: viewModel).environmentObject(deviceManager.displayGlucoseUnitObservable)
 
         // After confirming a bolus, pop back to this controller's predecessor, i.e. all the way back out of the carb flow.

Loop/View Controllers/StatusTableViewController.swift

@@ -1296,6 +1296,7 @@ final class StatusTableViewController: LoopChartsTableViewController {
             Task { @MainActor in
                 await viewModel.generateRecommendationAndStartObserving()
             }
+            viewModel.analyticsServicesManager = deviceManager.analyticsServicesManager
             let bolusEntryView = BolusEntryView(viewModel: viewModel).environmentObject(deviceManager.displayGlucoseUnitObservable)
             hostingController = DismissibleHostingController(rootView: bolusEntryView, isModalInPresentation: false)
         }

Loop/View Models/BolusEntryViewModel.swift

@@ -149,6 +149,8 @@ final class BolusEntryViewModel: ObservableObject {
     private let debounceIntervalMilliseconds: Int
     private let uuidProvider: () -> String
     private let carbEntryDateFormatter: DateFormatter
+
+    var analyticsServicesManager: AnalyticsServicesManager?
 
     // MARK: - Initialization
 
@@ -400,6 +402,7 @@ final class BolusEntryViewModel: ObservableObject {
             }
             if let storedCarbEntry = await saveCarbEntry(carbEntry, replacingEntry: originalCarbEntry) {
                 self.dosingDecision.carbEntry = storedCarbEntry
+                self.analyticsServicesManager?.didAddCarbs(source: "Phone", amount: storedCarbEntry.quantity.doubleValue(for: .gram()))
             } else {
                 self.presentAlert(.carbEntryPersistenceFailure)
                 return false
@@ -413,7 +416,9 @@ final class BolusEntryViewModel: ObservableObject {
 
         if amountToDeliver > 0 {
             savedPreMealOverride = nil
-            delegate.enactBolus(units: amountToDeliver, activationType: activationType, completion: { _ in })
+            delegate.enactBolus(units: amountToDeliver, activationType: activationType, completion: { _ in
+                self.analyticsServicesManager?.didBolus(source: "Phone", units: amountToDeliver)
+            })
         }
         return true
     }