Skip to content

Repository.mergeActivityFileSteps: graceful last-wins on duplicate day (parity + no trap) #588

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

Merged
ryanbr merged 1 commit into from
Jul 18, 2026
Merged

Repository.mergeActivityFileSteps: graceful last-wins on duplicate day (parity + no trap) #588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Strand/Data/Repository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,10 @@ final class Repository: ObservableObject {
nonisolated static func mergeActivityFileSteps(into base: [DailyMetric],
_ activityFile: [DailyMetric]) -> [DailyMetric] {
guard !activityFile.isEmpty else { return base }
var byDay = Dictionary(uniqueKeysWithValues: base.map { ($0.day, $0) })
// Last-wins on a duplicate day rather than `uniqueKeysWithValues`, which TRAPS (crashes) if `base`
// ever carries two rows for one day. Matches the Kotlin twin's graceful merge and this file's own
// safe convention (the other `Dictionary(…, uniquingKeysWith:)` builders here).
var byDay = Dictionary(base.map { ($0.day, $0) }, uniquingKeysWith: { _, last in last })
for row in activityFile {
guard let steps = row.steps, steps > 0 else { continue }
if let existing = byDay[row.day] {
Expand Down
Loading