From 7d24f65a68c688c652c1306679bd9524cc479bdd Mon Sep 17 00:00:00 2001 From: Corey Baker Date: Mon, 24 Feb 2025 20:56:45 -0800 Subject: [PATCH] fix: Adding HealthKit Sample metadata --- .../OCKHealthKitPassthroughStore+EventUtilities.swift | 3 +++ .../TestHealthKitPassthroughStore+Events.swift | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CareKitStore/CareKitStore/HealthKit/OCKHealthKitPassthroughStore+EventUtilities.swift b/CareKitStore/CareKitStore/HealthKit/OCKHealthKitPassthroughStore+EventUtilities.swift index e01e13935..56253c89c 100644 --- a/CareKitStore/CareKitStore/HealthKit/OCKHealthKitPassthroughStore+EventUtilities.swift +++ b/CareKitStore/CareKitStore/HealthKit/OCKHealthKitPassthroughStore+EventUtilities.swift @@ -254,6 +254,9 @@ extension OCKHealthKitPassthroughStore { outcomeValue.startDate = sample.dateInterval.start outcomeValue.endDate = sample.dateInterval.end + outcomeValue.sourceRevision = sample.sourceRevision + outcomeValue.device = sample.device + outcomeValue.metadata = sample.metadata var updatedEvent = event diff --git a/CareKitStore/CareKitStoreTests/OCKHealthKitStore/TestHealthKitPassthroughStore+Events.swift b/CareKitStore/CareKitStoreTests/OCKHealthKitStore/TestHealthKitPassthroughStore+Events.swift index 378a8e040..6f68f563c 100644 --- a/CareKitStore/CareKitStoreTests/OCKHealthKitStore/TestHealthKitPassthroughStore+Events.swift +++ b/CareKitStore/CareKitStoreTests/OCKHealthKitStore/TestHealthKitPassthroughStore+Events.swift @@ -110,7 +110,10 @@ class TestHealthKitPassthroughStoreEvents: XCTestCase { id: UUID(), type: HKObjectType.quantityType(forIdentifier: heartRateTask.healthKitLinkage.quantityIdentifier)!, quantity: HKQuantity(unit: heartRateTask.healthKitLinkage.unit, doubleValue: $0), - dateInterval: DateInterval(start: heartRateStart, end: heartRateEnd) + dateInterval: DateInterval(start: heartRateStart, end: heartRateEnd), + sourceRevision: heartRateSourceRevision, + device: heartRateDevice, + metadata: heartRateMetadata ) } @@ -155,9 +158,15 @@ class TestHealthKitPassthroughStoreEvents: XCTestCase { XCTAssertEqual(outcomeValues.first?.doubleValue, 70) XCTAssertEqual(outcomeValues.first?.startDate, heartRateStart) XCTAssertEqual(outcomeValues.first?.endDate, heartRateEnd) + XCTAssertEqual(outcomeValues.first?.sourceRevision, heartRateSourceRevision) + XCTAssertEqual(outcomeValues.first?.device, heartRateDevice) + XCTAssertEqual(outcomeValues.first?.metadata, heartRateMetadata) XCTAssertEqual(outcomeValues.last?.doubleValue, 80) XCTAssertEqual(outcomeValues.last?.startDate, heartRateStart) XCTAssertEqual(outcomeValues.last?.endDate, heartRateEnd) + XCTAssertEqual(outcomeValues.last?.sourceRevision, heartRateSourceRevision) + XCTAssertEqual(outcomeValues.last?.device, heartRateDevice) + XCTAssertEqual(outcomeValues.last?.metadata, heartRateMetadata) default: XCTFail("Unexpected task")