[LOOP-993] Unify carb + bolus flow on watch (#63)

* [LOOP 993] Unify carb + bolus flow on watch

* Reset bolus amount when returning to carb entry

* Updates from review

Author: mpangburn

Common/Models/CarbAbsorptionTime.swift

@@ -0,0 +1,24 @@
+//
+//  CarbAbsorptionTime.swift
+//  WatchApp Extension
+//
+//  Created by Michael Pangburn on 4/1/20.
+//  Copyright © 2020 LoopKit Authors. All rights reserved.
+//
+
+enum CarbAbsorptionTime: Int, CaseIterable {
+    case fast = 0
+    case medium
+    case slow
+
+    var emoji: String {
+        switch self {
+        case .fast:
+            return "🍭"
+        case .medium:
+            return "🌮"
+        case .slow:
+            return "🍕"
+        }
+    }
+}

Common/Models/SetBolusUserInfo.swift

@@ -7,16 +7,13 @@
 //
 
 import Foundation
+import LoopKit
 
 
 struct SetBolusUserInfo {
     let value: Double
     let startDate: Date
-
-    init(value: Double, startDate: Date) {
-        self.value = value
-        self.startDate = startDate
-    }
+    let carbEntry: NewCarbEntry?
 }
 
 
@@ -37,14 +34,21 @@ extension SetBolusUserInfo: RawRepresentable {
 
         self.value = value
         self.startDate = startDate
+        self.carbEntry = (rawValue["ce"] as? NewCarbEntry.RawValue).flatMap(NewCarbEntry.init(rawValue:))
     }
 
     var rawValue: RawValue {
-        return [
+        var raw: RawValue = [
             "v": type(of: self).version,
             "name": SetBolusUserInfo.name,
             "bv": value,
             "sd": startDate
         ]
+
+        if let carbEntry = carbEntry {
+            raw["ce"] = carbEntry.rawValue
+        }
+
+        return raw
     }
 }

Common/Models/WatchContext.swift

@@ -33,6 +33,9 @@ final class WatchContext: RawRepresentable {
     var lastNetTempBasalDate: Date?
     var recommendedBolusDose: Double?
 
+    var potentialCarbEntry: NewCarbEntry?
+    var recommendedBolusDoseConsideringPotentialCarbEntry: Double?
+
     var cob: Double?
     var iob: Double?
     var reservoir: Double?
@@ -68,6 +71,10 @@ final class WatchContext: RawRepresentable {
         lastNetTempBasalDose = rawValue["ba"] as? Double
         lastNetTempBasalDate = rawValue["bad"] as? Date
         recommendedBolusDose = rawValue["rbo"] as? Double
+        if let rawPotentialCarbEntry = rawValue["pce"] as? NewCarbEntry.RawValue {
+            potentialCarbEntry = NewCarbEntry(rawValue: rawPotentialCarbEntry)
+        }
+        recommendedBolusDoseConsideringPotentialCarbEntry = rawValue["rbce"] as? Double
         cob = rawValue["cob"] as? Double
 
         cgmManagerState = rawValue["cgmManagerState"] as? CGMManager.RawStateValue
@@ -101,6 +108,8 @@ final class WatchContext: RawRepresentable {
         raw["ld"] = loopLastRunDate
         raw["r"] = reservoir
         raw["rbo"] = recommendedBolusDose
+        raw["pce"] = potentialCarbEntry?.rawValue
+        raw["rbce"] = recommendedBolusDoseConsideringPotentialCarbEntry
         raw["rp"] = reservoirPercentage
 
         raw["pg"] = predictedGlucose?.rawValue

Loop.xcodeproj/project.pbxproj

@@ -530,7 +530,7 @@ extension LoopDataManager {
     ///   - carbEntry: The new carb value
     ///   - completion: A closure called once upon completion
     ///   - result: The bolus recommendation
-    func addCarbEntryAndRecommendBolus(_ carbEntry: NewCarbEntry, replacing replacingEntry: StoredCarbEntry? = nil, completion: @escaping (_ result: Result<BolusRecommendation?>) -> Void) {
+    func addCarbEntry(_ carbEntry: NewCarbEntry, replacing replacingEntry: StoredCarbEntry? = nil, completion: @escaping (_ result: Result<Void>) -> Void) {
         let addCompletion: (CarbStoreResult<StoredCarbEntry>) -> Void = { (result) in
             self.dataAccessQueue.async {
                 switch result {
@@ -544,7 +544,7 @@ extension LoopDataManager {
                     do {
                         try self.update()
 
-                        completion(.success(self.recommendedBolus?.recommendation))
+                        completion(.success(()))
                     } catch let error {
                         completion(.failure(error))
                     }

Loop/Managers/LoopDataManager.swift

@@ -139,7 +139,7 @@ final class WatchDataManager: NSObject {
         }
     }
 
-    private func createWatchContext(_ completion: @escaping (_ context: WatchContext) -> Void) {
+    private func createWatchContext(recommendingBolusFor potentialCarbEntry: NewCarbEntry? = nil, _ completion: @escaping (_ context: WatchContext) -> Void) {
         let loopManager = deviceManager.loopManager!
 
         let glucose = loopManager.glucoseStore.latestGlucose
@@ -160,6 +160,11 @@ final class WatchDataManager: NSObject {
             if let trend = self.deviceManager.cgmManager?.sensorState?.trendType {
                 context.glucoseTrendRawValue = trend.rawValue
             }
+
+            if let potentialCarbEntry = potentialCarbEntry {
+                context.potentialCarbEntry = potentialCarbEntry
+                context.recommendedBolusDoseConsideringPotentialCarbEntry = try? state.recommendBolus(consideringPotentialCarbEntry: potentialCarbEntry, replacingCarbEntry: nil)?.amount
+            }
 
             if let glucose = glucose {
                 updateGroup.enter()
@@ -201,21 +206,36 @@ final class WatchDataManager: NSObject {
         }
     }
 
-    private func addCarbEntryFromWatchMessage(_ message: [String: Any], completionHandler: ((_ error: Error?) -> Void)? = nil) {
-        if let carbEntry = CarbEntryUserInfo(rawValue: message)?.carbEntry {
-            deviceManager.loopManager.addCarbEntryAndRecommendBolus(carbEntry) { (result) in
+    private func addCarbEntryAndBolusFromWatchMessage(_ message: [String: Any]) {
+        guard let bolus = SetBolusUserInfo(rawValue: message as SetBolusUserInfo.RawValue) else {
+            log.error("Could not enact bolus from from unknown message: %{public}@", String(describing: message))
+            return
+        }
+
+        func enactBolus() {
+            guard bolus.value > 0 else { return }
+            self.deviceManager.enactBolus(units: bolus.value, at: bolus.startDate) { (error) in
+                if error == nil {
+                    self.deviceManager.analyticsServicesManager.didSetBolusFromWatch(bolus.value)
+                }
+
+                // When we've successfully started the bolus, send a new context with our new prediction
+                self.sendWatchContextIfNeeded()
+            }
+        }
+
+        if let carbEntry = bolus.carbEntry {
+            deviceManager.loopManager.addCarbEntry(carbEntry) { (result) in
                 switch result {
                 case .success:
                     self.deviceManager.analyticsServicesManager.didAddCarbsFromWatch()
-                    completionHandler?(nil)
+                    enactBolus()
                 case .failure(let error):
                     self.log.error("%{public}@", String(describing: error))
-                    completionHandler?(error)
                 }
             }
         } else {
-            log.error("Could not add carb entry from unknown message: %{public}@", String(describing: message))
-            completionHandler?(nil)
+            enactBolus()
         }
     }
 }
@@ -224,25 +244,18 @@ final class WatchDataManager: NSObject {
 extension WatchDataManager: WCSessionDelegate {
     func session(_ session: WCSession, didReceiveMessage message: [String: Any], replyHandler: @escaping ([String: Any]) -> Void) {
         switch message["name"] as? String {
-        case CarbEntryUserInfo.name?:
-            addCarbEntryFromWatchMessage(message) { (_) in
-                self.createWatchContext { (context) in
-                    // Send back the updated prediction and recommended bolus
+        case PotentialCarbEntryUserInfo.name?:
+            if let potentialCarbEntry = PotentialCarbEntryUserInfo(rawValue: message)?.carbEntry {
+                self.createWatchContext(recommendingBolusFor: potentialCarbEntry) { (context) in
                     replyHandler(context.rawValue)
                 }
+            } else {
+                log.error("Could not recommend bolus from from unknown message: %{public}@", String(describing: message))
+                replyHandler([:])
             }
         case SetBolusUserInfo.name?:
-            // Start the bolus and reply when it's successfully requested
-            if let bolus = SetBolusUserInfo(rawValue: message as SetBolusUserInfo.RawValue) {
-                self.deviceManager.enactBolus(units: bolus.value, at: bolus.startDate) { (error) in
-                    if error == nil {
-                        self.deviceManager.analyticsServicesManager.didSetBolusFromWatch(bolus.value)
-                    }
-
-                    // When we've successfully started the bolus, send a new context with our new prediction
-                    self.sendWatchContextIfNeeded()
-                }
-            }
+            // Add carbs if applicable; start the bolus and reply when it's successfully requested
+            addCarbEntryAndBolusFromWatchMessage(message)
 
             // Reply immediately
             replyHandler([:])
@@ -282,7 +295,7 @@ extension WatchDataManager: WCSessionDelegate {
     }
 
     func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any]) {
-        addCarbEntryFromWatchMessage(userInfo)
+        assertionFailure("We currently don't expect any userInfo messages transferred from the watch side")
     }
 
     func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {

Loop/Managers/WatchDataManager.swift

@@ -528,7 +528,7 @@ final class CarbAbsorptionViewController: ChartsTableViewController, Identifiabl
                 }
             }
 
-            deviceManager.loopManager.addCarbEntryAndRecommendBolus(updatedEntry, replacing: bolusViewController.originalCarbEntry) { (result) in
+            deviceManager.loopManager.addCarbEntry(updatedEntry, replacing: bolusViewController.originalCarbEntry) { (result) in
                 DispatchQueue.main.async {
                     switch result {
                     case .success:

Loop/View Controllers/CarbAbsorptionViewController.swift

@@ -1124,7 +1124,7 @@ final class StatusTableViewController: ChartsTableViewController {
                 }
             }
 
-            deviceManager.loopManager.addCarbEntryAndRecommendBolus(carbEntry) { result in
+            deviceManager.loopManager.addCarbEntry(carbEntry) { result in
                 DispatchQueue.main.async {
                     switch result {
                     case .success:

Loop/View Controllers/StatusTableViewController.swift

@@ -1,5 +1,5 @@
 //
-//  CarbEntryUserInfo.swift
+//  PotentialCarbEntryUserInfo.swift
 //  Naterade
 //
 //  Created by Nathan Racklyeft on 1/23/16.
@@ -10,7 +10,7 @@ import Foundation
 import LoopKit
 
 
-public struct CarbEntryUserInfo {
+public struct PotentialCarbEntryUserInfo {
     public let carbEntry: NewCarbEntry
 
     public init(carbEntry: NewCarbEntry) {
@@ -19,14 +19,14 @@ public struct CarbEntryUserInfo {
 }
 
 
-extension CarbEntryUserInfo: RawRepresentable {
+extension PotentialCarbEntryUserInfo: RawRepresentable {
     public typealias RawValue = [String: Any]
 
-    static let version = 2
-    public static let name = "CarbEntryUserInfo"
+    static let version = 1
+    public static let name = "PotentialCarbEntryUserInfo"
 
     public init?(rawValue: RawValue) {
-        guard rawValue["v"] as? Int == type(of: self).version && rawValue["name"] as? String == CarbEntryUserInfo.name,
+        guard rawValue["v"] as? Int == type(of: self).version && rawValue["name"] as? String == PotentialCarbEntryUserInfo.name,
             let value = rawValue["ce"] as? NewCarbEntry.RawValue,
             let carbEntry = NewCarbEntry(rawValue: value)
         else {
@@ -39,7 +39,7 @@ extension CarbEntryUserInfo: RawRepresentable {
     public var rawValue: RawValue {
         return [
             "v": type(of: self).version,
-            "name": CarbEntryUserInfo.name,
+            "name": PotentialCarbEntryUserInfo.name,
             "ce": carbEntry.rawValue,
         ]
     }