LOOP-1361 Capture manually entered BG reading (#110)

- https://tidepool.atlassian.net/browse/LOOP-1361
- Add wasUserEntered property to various glucose data structures

Author: Darin Krauss

Common/Models/WatchContext.swift

@@ -21,6 +21,8 @@ final class WatchContext: RawRepresentable {
     var glucose: HKQuantity?
     var glucoseTrendRawValue: Int?
     var glucoseDate: Date?
+    var glucoseIsDisplayOnly: Bool?
+    var glucoseWasUserEntered: Bool?
     var glucoseSyncIdentifier: String?
 
     var predictedGlucose: WatchPredictedGlucose?
@@ -61,6 +63,8 @@ final class WatchContext: RawRepresentable {
 
         glucoseTrendRawValue = rawValue["gt"] as? Int
         glucoseDate = rawValue["gd"] as? Date
+        glucoseIsDisplayOnly = rawValue["gdo"] as? Bool
+        glucoseWasUserEntered = rawValue["gue"] as? Bool
         glucoseSyncIdentifier = rawValue["gs"] as? String
         iob = rawValue["iob"] as? Double
         reservoir = rawValue["r"] as? Double
@@ -103,6 +107,8 @@ final class WatchContext: RawRepresentable {
 
         raw["gt"] = glucoseTrendRawValue
         raw["gd"] = glucoseDate
+        raw["gdo"] = glucoseIsDisplayOnly
+        raw["gue"] = glucoseWasUserEntered
         raw["gs"] = glucoseSyncIdentifier
         raw["iob"] = iob
         raw["ld"] = loopLastRunDate
@@ -132,7 +138,7 @@ extension WatchContext {
 extension WatchContext {
     var newGlucoseSample: NewGlucoseSample? {
         if let quantity = glucose, let date = glucoseDate, let syncIdentifier = glucoseSyncIdentifier {
-            return NewGlucoseSample(date: date, quantity: quantity, isDisplayOnly: false, syncIdentifier: syncIdentifier, syncVersion: 0)
+            return NewGlucoseSample(date: date, quantity: quantity, isDisplayOnly: glucoseIsDisplayOnly ?? false, wasUserEntered: glucoseWasUserEntered ?? false, syncIdentifier: syncIdentifier, syncVersion: 0)
         }
         return nil
     }

Common/Models/WatchHistoricalGlucose.swift

@@ -16,7 +16,7 @@ struct WatchHistoricalGlucose {
 
     init(with samples: [StoredGlucoseSample]) {
         self.samples = samples.map {
-            NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: false, syncIdentifier: $0.syncIdentifier, syncVersion: 0)
+            NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: $0.isDisplayOnly, wasUserEntered: $0.wasUserEntered, syncIdentifier: $0.syncIdentifier, syncVersion: 0)
         }
     }
 }
@@ -29,7 +29,9 @@ extension WatchHistoricalGlucose: RawRepresentable {
         return [
             "d": samples.map { $0.date },
             "v": samples.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) },
-            "id": samples.map { $0.syncIdentifier }
+            "id": samples.map { $0.syncIdentifier },
+            "do": samples.map { $0.isDisplayOnly },
+            "ue": samples.map { $0.wasUserEntered }
         ]
     }
 
@@ -38,14 +40,18 @@ extension WatchHistoricalGlucose: RawRepresentable {
             let dates = rawValue["d"] as? [Date],
             let values = rawValue["v"] as? [Int16],
             let syncIdentifiers = rawValue["id"] as? [String],
+            let isDisplayOnly = rawValue["do"] as? [Bool],
+            let wasUserEntered = rawValue["ue"] as? [Bool],
             dates.count == values.count,
-            dates.count == syncIdentifiers.count
+            dates.count == syncIdentifiers.count,
+            dates.count == isDisplayOnly.count,
+            dates.count == wasUserEntered.count
         else {
                 return nil
         }
 
         self.samples = (0..<dates.count).map {
-            NewGlucoseSample(date: dates[$0], quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(values[$0])), isDisplayOnly: false, syncIdentifier: syncIdentifiers[$0], syncVersion: 0)
+            NewGlucoseSample(date: dates[$0], quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(values[$0])), isDisplayOnly: isDisplayOnly[$0], wasUserEntered: wasUserEntered[$0], syncIdentifier: syncIdentifiers[$0], syncVersion: 0)
         }
     }
 }

Loop/Extensions/GlucoseStore+SimulatedCoreData.swift

@@ -69,6 +69,7 @@ fileprivate extension StoredGlucoseSample {
                                    startDate: startDate,
                                    quantity: HKQuantity(unit: unit, doubleValue: value),
                                    isDisplayOnly: false,
+                                   wasUserEntered: false,
                                    provenanceIdentifier: Bundle.main.bundleIdentifier!)
     }
 }

Loop/Managers/WatchDataManager.swift

@@ -170,6 +170,8 @@ final class WatchDataManager: NSObject {
                     if let sample = samples.last {
                         context.glucose = sample.quantity
                         context.glucoseDate = sample.startDate
+                        context.glucoseIsDisplayOnly = sample.isDisplayOnly
+                        context.glucoseWasUserEntered = sample.wasUserEntered
                         context.glucoseSyncIdentifier = sample.syncIdentifier
                     }
                     updateGroup.leave()

Loop/Models/WatchContext+LoopKit.swift

@@ -11,11 +11,13 @@ import HealthKit
 import LoopKit
 
 extension WatchContext {
-    convenience init(glucose: GlucoseValue?, glucoseUnit: HKUnit?) {
+    convenience init(glucose: GlucoseSampleValue?, glucoseUnit: HKUnit?) {
         self.init()
 
         self.glucose = glucose?.quantity
         self.glucoseDate = glucose?.startDate
+        self.glucoseIsDisplayOnly = glucose?.isDisplayOnly
+        self.glucoseWasUserEntered = glucose?.wasUserEntered
         self.preferredGlucoseUnit = glucoseUnit
     }
 }