LOOP-1328: Adds healthKitEligibleDate (#441)

Author: Rick Pasetto

Common/Models/WatchHistoricalGlucose.swift

@@ -45,6 +45,7 @@ extension WatchHistoricalGlucose: RawRepresentable {
         let isDisplayOnlys: [Bool]
         let wasUserEntereds: [Bool]
         let devices: [Data?]
+        let healthKitEligibleDates: [Date?]
 
         init(samples: [StoredGlucoseSample]) {
             self.uuids = samples.map { $0.uuid }
@@ -57,20 +58,22 @@ extension WatchHistoricalGlucose: RawRepresentable {
             self.isDisplayOnlys = samples.map { $0.isDisplayOnly }
             self.wasUserEntereds = samples.map { $0.wasUserEntered }
             self.devices = samples.map { try? WatchHistoricalGlucose.encoder.encode($0.device) }
+            self.healthKitEligibleDates = samples.map { $0.healthKitEligibleDate }
         }
 
         var samples: [StoredGlucoseSample] {
             return (0..<uuids.count).map {
                 return StoredGlucoseSample(uuid: uuids[$0],
-                                    provenanceIdentifier: provenanceIdentifiers[$0],
-                                    syncIdentifier: syncIdentifiers[$0],
-                                    syncVersion: syncVersions[$0],
-                                    startDate: startDates[$0],
-                                    quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: quantities[$0]),
-                                    trend: trends[$0],
-                                    isDisplayOnly: isDisplayOnlys[$0],
-                                    wasUserEntered: wasUserEntereds[$0],
-                                    device: devices[$0].flatMap { try? HKDevice(from: $0) })
+                                           provenanceIdentifier: provenanceIdentifiers[$0],
+                                           syncIdentifier: syncIdentifiers[$0],
+                                           syncVersion: syncVersions[$0],
+                                           startDate: startDates[$0],
+                                           quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: quantities[$0]),
+                                           trend: trends[$0],
+                                           isDisplayOnly: isDisplayOnlys[$0],
+                                           wasUserEntered: wasUserEntereds[$0],
+                                           device: devices[$0].flatMap { try? HKDevice(from: $0) },
+                                           healthKitEligibleDate: healthKitEligibleDates[$0])
             }
         }
     }

LoopTests/Managers/CGMStalenessMonitorTests.swift

@@ -18,7 +18,7 @@ class CGMStalenessMonitorTests: XCTestCase {
     private var fetchExpectation: XCTestExpectation?
 
     private var storedGlucoseSample: StoredGlucoseSample {
-        return StoredGlucoseSample(uuid: UUID(), provenanceIdentifier: UUID().uuidString, syncIdentifier: "syncIdentifier", syncVersion: 1, startDate: Date().addingTimeInterval(-.minutes(5)), quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 120), trend: .flat, isDisplayOnly: false, wasUserEntered: false, device: nil)
+        return StoredGlucoseSample(uuid: UUID(), provenanceIdentifier: UUID().uuidString, syncIdentifier: "syncIdentifier", syncVersion: 1, startDate: Date().addingTimeInterval(-.minutes(5)), quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 120), trend: .flat, isDisplayOnly: false, wasUserEntered: false, device: nil, healthKitEligibleDate: nil)
     }
 
     private var newGlucoseSample: NewGlucoseSample {

LoopTests/Models/WatchHistoricalGlucoseTest.swift

@@ -24,7 +24,8 @@ class WatchHistoricalGlucoseTests: XCTestCase {
                                     trend: nil,
                                     isDisplayOnly: false,
                                     wasUserEntered: true,
-                                    device: device),
+                                    device: device,
+                                    healthKitEligibleDate: Date(timeIntervalSinceReferenceDate: .hours(100)).addingTimeInterval(.hours(3))),
                 StoredGlucoseSample(uuid: UUID(),
                                     provenanceIdentifier: UUID().uuidString,
                                     syncIdentifier: UUID().uuidString,
@@ -34,7 +35,8 @@ class WatchHistoricalGlucoseTests: XCTestCase {
                                     trend: .up,
                                     isDisplayOnly: true,
                                     wasUserEntered: false,
-                                    device: device),
+                                    device: device,
+                                    healthKitEligibleDate: nil),
                 StoredGlucoseSample(uuid: nil,
                                     provenanceIdentifier: UUID().uuidString,
                                     syncIdentifier: nil,
@@ -44,7 +46,8 @@ class WatchHistoricalGlucoseTests: XCTestCase {
                                     trend: .downDownDown,
                                     isDisplayOnly: false,
                                     wasUserEntered: false,
-                                    device: nil),
+                                    device: nil,
+                                    healthKitEligibleDate: nil),
         ]
     }()