file upload rework; HealthKit stats (WIP) by lukaskollmer · Pull Request #197 · SchmiedmayerLab/MyHeartCounts-iOS

lukaskollmer · 2026-08-12T18:59:10Z

♻️ Current situation & Problem

see #180, #190, #191

⚙️ Release Notes

reworked file uploading into a SwiftData-db-backed thing (see the issues linked above)
added explicit canonical units to all custom quantity types w/in MHC, and made the unitless QuantitySample.value property private (to force callers to explicitly specify a unit each time)
added a (still WIP, but actually functional apart from the fact that it currently is missing almost all of the sample types) HealthKit statistics calculator

📚 Documentation

n/a

✅ Testing

not yet

Code of Conduct & Contributing Guidelines

By creating and submitting this pull request, you agree to follow our Code of Conduct and Contributing Guidelines:

I agree to follow the Code of Conduct and Contributing Guidelines.

into lukas/data-spec # Conflicts: # MyHeartCounts.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

coderabbitai · 2026-08-12T18:59:22Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 8edad487-70d2-4e6f-9ca5-ab1cd2ec1a15

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

PSchmiedmayer

Happy to see merged once the things we discussed are incorporated + more tests. Good to drive the statistics based on the Firebase setup in the short term + ensure that we have the structure alignment document in place 🚀

PSchmiedmayer · 2026-08-12T23:37:46Z

            )
-            managedFileUpload.scheduleForUpload(results.compactMap { $0 }, category: .historicalHealthUpload)
+            let exportedFileUrls = results.compactMap { $0 }
+            Task { [managedFileUpload, logger] in


Should we keep track of the task and/or have some checks to not run them in parallel?

PSchmiedmayer · 2026-08-12T23:51:00Z

+            for descriptor in descriptors {
+                taskGroup.addTask {
+                    do {
+                        try await self._run(descriptor, lastNMonths: 1, accountDoc: accountDoc)


Should probably from enrollment on.

the current local-HealthKit-query-based implementation of the dashboard doesn't take the enrollment date into acount and instead simply fetches e.g. the last 2 weeks, without capping this based on the enrollment date.

IMO we should still compute a full year of stats; the app can then decide how much (and which sub-range) of that it wants to query...

PSchmiedmayer · 2026-08-12T23:52:15Z

+extension HealthKitStatsCalculator {
+    fileprivate struct MonthlyStatsDocument: Codable {
+        // A single sum or min/max/avg entry in the single-month stats document
+        struct StatEntry: Codable {


TODO to sync with the main outline of how we want to define this & discuss with @pauljohanneskraft @eldcn @PaulGoldschmidt 👍

PSchmiedmayer · 2026-08-12T23:52:42Z

+//            fileprivate static let statsIntervalHourly = Self(stringValue: "hourly")
+//            fileprivate static let statsIntervalDaily = Self(stringValue: "daily")


Remove or encode?

PSchmiedmayer · 2026-08-12T23:54:26Z

+            // (Moved aside, not deleted, so that the previously-pending uploads at least remain recoverable.)
+            for filename in ["db.sqlite", "db.sqlite-shm", "db.sqlite-wal"] {
+                let url = Self.databaseDirectory.appending(component: filename, directoryHint: .notDirectory)
+                let brokenUrl = Self.databaseDirectory.appending(component: "broken-\(filename)", directoryHint: .notDirectory)


Probably would override? So might be good to append a date or something there?

PSchmiedmayer · 2026-08-12T23:56:38Z

+        let validNames = Set(uploads.map { $0.id.uuidString })
+        for url in (try? fileManager.contents(of: Self.stagingDirectory)) ?? [] where !validNames.contains(url.lastPathComponent) {
+            logger.notice("Deleting orphaned staging file at \(url.path)")
+            try? fileManager.removeItem(at: url)


We should probably somehow keep track how often that happens and be very sure that that's only when there was un very unfortunate things that it crashed between db removal and file removal.

PSchmiedmayer · 2026-08-12T23:57:24Z

+            let container = try decoder.container(keyedBy: CodingKey.self)
+            version = try container.decode(Int.self, forKey: .version)
+            metric = try container.decode(String.self, forKey: .metric)
+            let hmmm: [StatsTimeInterval: [String: [StatEntry]]] = try StatsTimeInterval.allCases.reduce(into: [:]) { result, timeInterval in


hmmmmm 😄

lukaskollmer · 2026-08-13T20:53:25Z

+        let now = Date()
+        let startDate = cal.date(byAdding: .month, value: -numMonths, to: cal.startOfMonth(for: now))!
+        let months: some Sequence<Range<Date>> = cal
+            .dates(byAdding: .month, value: 1, startingAt: startDate, in: startDate..<cal.startOfNextMonth(for: now))


we'll have to ensure that this sequence will properly contain the first occurrence (i.e., the startDate)

lukaskollmer added 14 commits August 8, 2026 12:15

add initlal wip draft versions

e69a602

whatever

6b3b729

update spec?

0a739e1

fix consent renewal

59a55b7

x

9e96faa

hmmm

d6a71ca

lil progress dump

2308689

rework ManagedFileUpload

9b9406a

changes

30960c9

Merge branch 'main' of https://github.com/StanfordBDHG/MyHeartCounts-iOS

e30daff

into lukas/data-spec # Conflicts: # MyHeartCounts.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

remove the spec

5d710db

give custom quantity sample types explicit canonical units

ed4197a

HKUnit+Codable

ac34e9f

HK stats calc (WIP)

112de8f

lukaskollmer requested a review from PSchmiedmayer August 12, 2026 18:59

lukaskollmer self-assigned this Aug 12, 2026

lukaskollmer added this to MyHeartCounts Aug 12, 2026

lukaskollmer added the enhancement New feature or request label Aug 12, 2026

github-project-automation Bot added this to MyHeart Counts Project Planning Aug 12, 2026

github-project-automation Bot moved this to In Progress in MyHeartCounts Aug 12, 2026

github-project-automation Bot moved this to In Progress in MyHeart Counts Project Planning Aug 12, 2026

PSchmiedmayer approved these changes Aug 12, 2026

View reviewed changes

lukaskollmer commented Aug 13, 2026

View reviewed changes

Navigation Menu

Uh oh!

Uh oh!

file upload rework; HealthKit stats (WIP) - #197

file upload rework; HealthKit stats (WIP)#197
lukaskollmer wants to merge 14 commits into
mainfrom
lukas/data-spec

lukaskollmer commented Aug 12, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented Aug 12, 2026

Review skipped

Uh oh!

PSchmiedmayer left a comment

Uh oh!

PSchmiedmayer Aug 12, 2026

Uh oh!

PSchmiedmayer Aug 12, 2026

Uh oh!

lukaskollmer Aug 13, 2026

Uh oh!

PSchmiedmayer Aug 12, 2026

Uh oh!

PSchmiedmayer Aug 12, 2026

Uh oh!

PSchmiedmayer Aug 12, 2026

Uh oh!

PSchmiedmayer Aug 12, 2026

Uh oh!

PSchmiedmayer Aug 12, 2026

Uh oh!

lukaskollmer Aug 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		// fileprivate static let statsIntervalHourly = Self(stringValue: "hourly")
		// fileprivate static let statsIntervalDaily = Self(stringValue: "daily")

Uh oh!

Uh oh!

Conversation

lukaskollmer commented Aug 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

♻️ Current situation & Problem

⚙️ Release Notes

📚 Documentation

✅ Testing

Code of Conduct & Contributing Guidelines

Uh oh!

coderabbitai Bot commented Aug 12, 2026

Review skipped

Uh oh!

PSchmiedmayer left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

lukaskollmer commented Aug 12, 2026 •

edited

Loading