Skip to content

fix: Query HealthKit samples over specified date interval #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cbaker6 wants to merge 10 commits into
base: main
Choose a base branch
from
Open

fix: Query HealthKit samples over specified date interval #723

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c4037df
fix: Query HealthKitSamples over specified date interval
cbaker6 Feb 23, 2025
b085481
test: All relevant properties of outcome query
cbaker6 Feb 23, 2025
957c213
nit
cbaker6 Feb 24, 2025
2ad0695
feat: All OCKOutcomeQuery sorting (#22)
cbaker6 Mar 3, 2025
83f4d2d
add more unit tests
cbaker6 Mar 3, 2025
e9be043
nit
cbaker6 Apr 24, 2025
981cb22
Merge branch 'main' into updateHealthKitOutcomeDateInterval
cbaker6 May 14, 2025
150122b
Merge branch 'main' into updateHealthKitOutcomeDateInterval
cbaker6 Dec 14, 2025
ec7b381
nits
cbaker6 Dec 14, 2025
f6923b7
more nits
cbaker6 Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CareKitStore/CareKitStore/HealthKit/OCKHealthKitPassthroughStore+EventUtilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,10 @@ extension OCKHealthKitPassthroughStore {

func makeTaskQuery(from outcomeQuery: OCKOutcomeQuery) -> OCKTaskQuery {

let dateInterval = Calendar.current.dateInterval(of: .day, for: Date())!
// Search over the interval provided by OCKOutcomeQuery if present
// or else constrain sample query over the current day.
let dateInterval = outcomeQuery.dateInterval ??
Calendar.current.dateInterval(of: .day, for: Date())!

@cbaker6 cbaker6 Feb 24, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to

CareKit/CareKitStore/CareKitStore/Protocols/Events/OCKReadOnlyEventStore+VersioningUtilities.swift

Lines 225 to 232 in b16d15c

// We need to explicitly set the date interval in case it's nil
// to ensure that we fetch the most recent version of a task in a
// given date interval, and not all versions of the task
let dateInterval = latestTaskVersionsQuery.dateInterval ??
Calendar.current.dateInterval(of: .day, for: Date())!
latestTaskVersionsQuery.dateInterval = dateInterval


var taskQuery = OCKTaskQuery(dateInterval: dateInterval)
taskQuery.ids = outcomeQuery.taskIDs
Expand Down
42 changes: 42 additions & 0 deletions ...KitStore/CareKitStoreTests/OCKHealthKitStore/TestHealthKitPassthroughStore+Outcomes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,48 @@ class TestHealthKitPassthroughStoreOutcomes: XCTestCase {
try passthroughStore.checkAbilityToDelete(outcomes: outcomes)
}

func testTaskQueryDefaultsToCurrentDayDateInterval() async throws {
let outcomeTaskQuery = OCKOutcomeQuery()
let taskQuery = passthroughStore.makeTaskQuery(from: outcomeTaskQuery)
let currentDayDateInterval = Calendar.current.dateInterval(of: .day, for: Date())!

XCTAssertEqual(
taskQuery.dateInterval?.start,
currentDayDateInterval.start
)
XCTAssertEqual(
taskQuery.dateInterval?.end,
currentDayDateInterval.end
)
XCTAssertEqual(taskQuery.ids, outcomeTaskQuery.taskIDs)
XCTAssertEqual(taskQuery.remoteIDs, outcomeTaskQuery.taskRemoteIDs)
XCTAssertEqual(taskQuery.uuids, outcomeTaskQuery.taskUUIDs)
}

func testTaskQueryPropertiesAdoptsOutcomeQueryProperties() async throws {
let yesterday = Calendar.current.date(
byAdding: .day,
value: -1,
to: Date()
)!
let yesterdayDateInterval = Calendar.current.dateInterval(
of: .day,
for: yesterday
)!
var outcomeTaskQuery = OCKOutcomeQuery(
dateInterval: yesterdayDateInterval
)
outcomeTaskQuery.taskIDs = ["id"]
outcomeTaskQuery.taskRemoteIDs = ["remoteID"]
outcomeTaskQuery.taskUUIDs = [UUID()]
let taskQuery = passthroughStore.makeTaskQuery(from: outcomeTaskQuery)

XCTAssertEqual(taskQuery.dateInterval, outcomeTaskQuery.dateInterval)
XCTAssertEqual(taskQuery.ids, outcomeTaskQuery.taskIDs)
XCTAssertEqual(taskQuery.remoteIDs, outcomeTaskQuery.taskRemoteIDs)
XCTAssertEqual(taskQuery.uuids, outcomeTaskQuery.taskUUIDs)
}

// MARK: - Utilities

private func makeStepsTask() -> OCKHealthKitTask {
Expand Down