mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-18 16:12:11 +00:00
fix(workouts): one canonical-workout picker with one source order
Three pickers decided which of two overlapping workouts to keep: the read-time picker the list, the detail page and the Coach use, a write-time batch picker with its own 90-second window, and an unwired field-merge picker. They used different source orders (the `steps` ladder, or a separate workout default when no order was saved), so the batch route could keep a row the list then ranked below another. The batch route now runs the read-time picker over the rows it is about to insert, with the ladder from `workoutSourceLadder`, and reports what it hides as duplicates. A session HealthKit hands over twice under two ids is stored once, as the list already showed it. The write-time and the unwired picker are removed.
This commit is contained in:
1 parent
2861075676
commit
e355c6120f
8 files changed
+109
-71
No files matched your search
@@ -1,7 +1,9 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { pickCanonicalWorkoutRows } from "@/lib/measurements/pick-canonical-workout-rows";
|
||||
import { DEFAULT_WORKOUT_SOURCE_PRIORITY } from "@/lib/sources/pick-canonical-workout";
|
||||
import {
|
||||
pickCanonicalWorkoutRows,
|
||||
workoutSourceLadder,
|
||||
} from "@/lib/measurements/pick-canonical-workout-rows";
|
||||
import { DEFAULT_SOURCE_PRIORITY } from "@/lib/validations/source-priority";
|
||||
|
||||
/**
|
||||
@@ -67,10 +69,10 @@ describe("STRAVA workout dedup — read-time canonical picker", () => {
|
||||
});
|
||||
|
||||
describe("STRAVA sits in the workout source ladders", () => {
|
||||
it("is present in the workout default ladder, below the wearables, above MANUAL", () => {
|
||||
const strava = DEFAULT_WORKOUT_SOURCE_PRIORITY.indexOf("STRAVA");
|
||||
const withings = DEFAULT_WORKOUT_SOURCE_PRIORITY.indexOf("WITHINGS");
|
||||
const manual = DEFAULT_WORKOUT_SOURCE_PRIORITY.indexOf("MANUAL");
|
||||
it("is present in the workout ladder, below the wearables, above MANUAL", () => {
|
||||
const strava = workoutSourceLadder(null).indexOf("STRAVA");
|
||||
const withings = workoutSourceLadder(null).indexOf("WITHINGS");
|
||||
const manual = workoutSourceLadder(null).indexOf("MANUAL");
|
||||
expect(strava).toBeGreaterThan(withings);
|
||||
expect(strava).toBeLessThan(manual);
|
||||
});
|
||||
|
||||
@@ -7,11 +7,10 @@
|
||||
* to write `summary.sport_type ?? summary.type ?? detail?.sport_type ??
|
||||
* "workout"` straight into `Workout.sportType`, so a Strava "Run" or
|
||||
* "VirtualRide" never matched a canonical bucket — `/insights/workouts`
|
||||
* rendered every Strava row generic, and the read-time picker in
|
||||
* `src/lib/sources/pick-canonical-workout.ts` treats any two GENERIC rows
|
||||
* as sport-compatible, so a same-source brick session (a Strava "Ride"
|
||||
* ending 15:00 immediately followed by a Strava "Run" starting 15:03)
|
||||
* clustered into one and silently dropped a leg. Fitbit
|
||||
* rendered every Strava row generic, and a picker that treats two generic
|
||||
* rows as the same sport clusters a same-source brick session (a Strava
|
||||
* "Ride" ending 15:00 immediately followed by a Strava "Run" starting
|
||||
* 15:03) into one and silently drops a leg. Fitbit
|
||||
* (`mapFitbitSportType()` in `src/lib/fitbit/client.ts`), Google Health
|
||||
* (`mapGoogleHealthSportType()` in `src/lib/google-health/mappers.ts`), and
|
||||
* WHOOP (`mapWhoopSportType()` in `src/lib/whoop/sport-map.ts`) all
|
||||
|
||||
Reference in new issue
Block a user