mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-09 21:10:59 +00:00
Bundles the deferred v1.4.47 Mediums + Lows with the v1.4.48-deferred items into a single release. Headline: server-side suppression of MEDICATION_REMINDER APNs for iOS clients that own their local reminders (closes GH #206), a push_attempts table backing /api/admin/notifications/diagnostic, and a sweep of v1.4.48 QA forward-findings. Performance (the user-visible win): - /api/analytics cold-fallback path splits the heavy single-statement aggregate into two parallel queries. The linearly composable columns (count / min / max / mean) keep the full-partition scan; the windowed 7 / 30 / 90-day avg / slope / r² columns take a 90-day outer cap so the planner does an index range scan on (user_id, type, measured_at) instead of a full-partition sequential scan. Output is bit-identical; cold slim slice drops from multi-second to sub-second on tenants with large measurement partitions. Server-side notifications: - GET + PATCH /api/auth/me/notification-prefs with deep-merge semantics. Initial category medication.clientManaged: boolean (default false). Cron medicationReminderJob skips dose-due APNs when the flag is true, emitting a medication_reminder.suppressed_client_managed wide-event annotation per skip. - push_attempts table backs the diagnostic endpoint. Every APNS / Web-Push / Telegram / NTFY sender writes a fire-and-forget row. Daily 03:35 Europe/Berlin cleanup prunes rows older than 90 days. - /api/admin/notifications/diagnostic — admin-only endpoint surfacing device APNs token presence (masked), channel config presence, and recent push attempts. Registered in OpenAPI. - Per-channel APNs "Send test" button now fires with eventType: "MEDICATION_REMINDER" so the dispatcher's time-sensitive + priority-10 branch runs. A successful self-test now exercises the exact path production reminders take; an unsuccessful one points the user at iOS Settings → Time Sensitive Notifications rather than appearing to be a server-side bug. Withings reliability: - OAuth callback consumes the nonce atomically (delete-first with P2025 catch for the replay branch). The previous read-then-delete pattern allowed a race between two concurrent callbacks. - ?reason=state redirect differentiated into csrf1 / replay / expired / cross_user so operators can tell mismatch types apart without DB shell access. - connect endpoint rate-limited to 10/60s/user; row-create failures redirect to a consistent error surface. Observability hardening: - redactSensitiveFields(body) denylist helper covers password / token / secret / apiKey / authorization / csrfState / nonce, recursive, case-insensitive. Caught: /api/devices invalid_format issues were echoing apnsToken values verbatim into the audit log. - sanitiseZodIssues(issues, { stripValuesFromMessage: true }) overload applied to 14 audit-log sites. Migrations: 0079 (notification_prefs), 0080 (push_attempts). Tests: 4815 → 5272 unit + integration. Workout-batch integration suite that had been red on main since v1.4.45 (three release commits shipped through it) now green again — updated to match v1.4.42 cross-source dedup semantics. Resolves PR #207.
226 lines
8.4 KiB
TypeScript
226 lines
8.4 KiB
TypeScript
/**
|
|
* Concurrent-write race coverage for `POST /api/workouts/batch`.
|
|
*
|
|
* Mirrors the v1.4.25 W10 fix-C reconciliation pattern that landed for
|
|
* the measurements batch endpoint
|
|
* (`tests/integration/measurements-batch.test.ts` — the
|
|
* `keeps per-entry status in sync with aggregate counts under a
|
|
* concurrent-write race` case). When two batches with overlapping
|
|
* `(userId, source, externalId)` tuples land in parallel, only one
|
|
* row per tuple may exist in the DB after the dust settles, and each
|
|
* response body's per-entry envelope MUST sum to its own aggregate
|
|
* counts so the iOS sync cursor can advance unambiguously.
|
|
*
|
|
* Pulled into its own file so the contention assertion remains
|
|
* isolated from the broader workout-batch surface — the W10 fix was a
|
|
* one-line invariant that took two hours of audit work to expose, and
|
|
* regressions on it would be near-invisible in a mixed-purpose file.
|
|
*/
|
|
import { NextRequest } from "next/server";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
import { cookieJar, headerJar } from "./mock-next-headers";
|
|
import { getPrismaClient, truncateAllTables } from "./setup";
|
|
|
|
const TEST_USER_ID = "user-workout-race-test";
|
|
|
|
vi.mock("next/headers", async () => {
|
|
const { cookieJar, headerJar } = await import("./mock-next-headers");
|
|
return {
|
|
headers: vi.fn(async () => ({
|
|
get: (name: string) => headerJar.get(name.toLowerCase()) ?? null,
|
|
})),
|
|
cookies: vi.fn(async () => ({
|
|
get: (name: string) => {
|
|
const value = cookieJar.get(name);
|
|
return value ? { name, value } : undefined;
|
|
},
|
|
set: (name: string, value: string) => {
|
|
cookieJar.set(name, value);
|
|
},
|
|
delete: (name: string) => {
|
|
cookieJar.delete(name);
|
|
},
|
|
})),
|
|
};
|
|
});
|
|
|
|
vi.mock("@/lib/db-compat", () => ({
|
|
ensureDbCompatibility: vi.fn().mockResolvedValue(undefined),
|
|
}));
|
|
|
|
beforeEach(async () => {
|
|
await truncateAllTables(getPrismaClient());
|
|
cookieJar.clear();
|
|
headerJar.clear();
|
|
await getPrismaClient().user.create({
|
|
data: {
|
|
id: TEST_USER_ID,
|
|
username: "workout-race",
|
|
email: "workout-race@example.test",
|
|
},
|
|
});
|
|
const session = await getPrismaClient().session.create({
|
|
data: {
|
|
userId: TEST_USER_ID,
|
|
expiresAt: new Date(Date.now() + 60 * 60 * 1000),
|
|
},
|
|
});
|
|
cookieJar.set("healthlog_session", session.id);
|
|
});
|
|
|
|
interface WorkoutFixture {
|
|
sportType: string;
|
|
startedAt: string;
|
|
endedAt: string;
|
|
source: string;
|
|
externalId: string;
|
|
}
|
|
|
|
function makeRequest(body: { workouts: WorkoutFixture[] }): NextRequest {
|
|
return new NextRequest("http://localhost/api/workouts/batch", {
|
|
method: "POST",
|
|
headers: { "content-type": "application/json" },
|
|
body: JSON.stringify(body),
|
|
});
|
|
}
|
|
|
|
function workout(externalId: string, minuteOffset: number): WorkoutFixture {
|
|
return {
|
|
sportType: "running",
|
|
startedAt: new Date(2026, 4, 14, 6, minuteOffset).toISOString(),
|
|
endedAt: new Date(2026, 4, 14, 7, minuteOffset).toISOString(),
|
|
source: "APPLE_HEALTH",
|
|
externalId,
|
|
};
|
|
}
|
|
|
|
describe("POST /api/workouts/batch — concurrent-write race", () => {
|
|
// v1.4.25 W10 reconcile (senior-dev H-1 parity for workouts).
|
|
//
|
|
// Two batches with overlapping `(userId, source, externalId)` tuples
|
|
// posted in parallel MUST resolve to exactly one DB row per tuple
|
|
// (the composite unique index enforces it; createMany.skipDuplicates
|
|
// absorbs the duplicate-key conflicts). What can go wrong is the
|
|
// per-entry envelope: the original pattern compared "rows we
|
|
// attempted" vs "rows now in the DB" — but every attempted row is
|
|
// present after the call (either we wrote it or the other batch did),
|
|
// so the diff is always zero and the envelope drifts out of sync
|
|
// with the aggregate counts under contention. The fix trusts
|
|
// `createMany.count` for the aggregate `insertedCount` and downgrades
|
|
// exactly that many "inserted" statuses to "duplicate", so the per-
|
|
// entry envelope sums match the aggregate counts — the invariant the
|
|
// iOS sync cursor relies on to checkpoint correctly.
|
|
it("keeps per-entry status in sync with aggregate counts under contention", async () => {
|
|
const { POST } = await import("@/app/api/workouts/batch/route");
|
|
|
|
const sharedWorkouts = (): WorkoutFixture[] =>
|
|
Array.from({ length: 6 }, (_, i) => workout(`hk-uuid-race-${i}`, i));
|
|
|
|
const [first, second] = await Promise.all([
|
|
POST(makeRequest({ workouts: sharedWorkouts() })),
|
|
POST(makeRequest({ workouts: sharedWorkouts() })),
|
|
]);
|
|
expect(first.status).toBe(200);
|
|
expect(second.status).toBe(200);
|
|
|
|
const firstJson = (await first.json()) as {
|
|
data: {
|
|
processed: number;
|
|
inserted: number;
|
|
duplicates: number;
|
|
entries: Array<{ status: string }>;
|
|
};
|
|
};
|
|
const secondJson = (await second.json()) as typeof firstJson;
|
|
|
|
// Invariant 1 — per-entry statuses sum to the aggregate counts.
|
|
// Before the W10 fix-C the comparable measurements test failed
|
|
// under contention because the no-op reconciliation left the
|
|
// envelope out of sync with the counts.
|
|
for (const json of [firstJson, secondJson]) {
|
|
const insertedEntries = json.data.entries.filter(
|
|
(e) => e.status === "inserted",
|
|
).length;
|
|
const duplicateEntries = json.data.entries.filter(
|
|
(e) => e.status === "duplicate",
|
|
).length;
|
|
const skippedEntries = json.data.entries.filter(
|
|
(e) => e.status === "skipped",
|
|
).length;
|
|
expect(insertedEntries).toBe(json.data.inserted);
|
|
expect(duplicateEntries).toBe(json.data.duplicates);
|
|
expect(insertedEntries + duplicateEntries + skippedEntries).toBe(
|
|
json.data.processed,
|
|
);
|
|
}
|
|
|
|
// Invariant 2 — counts non-negative. A naive "downgrade and also
|
|
// decrement" implementation could otherwise produce a negative
|
|
// `inserted` count under specific commit orderings.
|
|
expect(firstJson.data.inserted).toBeGreaterThanOrEqual(0);
|
|
expect(secondJson.data.inserted).toBeGreaterThanOrEqual(0);
|
|
|
|
// Invariant 3 — DB ends with at most 6 rows (composite unique
|
|
// index enforces single-copy) and the two responses' inserted
|
|
// counts sum to the row count actually present. Cross-validates
|
|
// that `createMany.count` is the truth source for the aggregate.
|
|
const stored = await getPrismaClient().workout.findMany({
|
|
where: { userId: TEST_USER_ID },
|
|
});
|
|
expect(stored.length).toBeLessThanOrEqual(6);
|
|
expect(firstJson.data.inserted + secondJson.data.inserted).toBe(
|
|
stored.length,
|
|
);
|
|
});
|
|
|
|
it("two batches with one overlapping externalId resolve to a single DB row each", async () => {
|
|
const { POST } = await import("@/app/api/workouts/batch/route");
|
|
|
|
// Batch A — two entries one minute apart plus one shared key. The
|
|
// v1.4.42 `dedupeWorkoutBatch` picker collapses the minute-1 +
|
|
// minute-2 pair (same activity, within the 90 s window) to one
|
|
// surviving row, leaving 2 effective rows per batch.
|
|
const batchA: WorkoutFixture[] = [
|
|
workout("hk-uuid-only-a-0", 1),
|
|
workout("hk-uuid-only-a-1", 2),
|
|
workout("hk-uuid-shared", 10),
|
|
];
|
|
// Batch B — same shape, different externalIds for the unique pair
|
|
// but the SAME shared key.
|
|
const batchB: WorkoutFixture[] = [
|
|
workout("hk-uuid-only-b-0", 21),
|
|
workout("hk-uuid-only-b-1", 22),
|
|
workout("hk-uuid-shared", 10),
|
|
];
|
|
|
|
const [resA, resB] = await Promise.all([
|
|
POST(makeRequest({ workouts: batchA })),
|
|
POST(makeRequest({ workouts: batchB })),
|
|
]);
|
|
expect(resA.status).toBe(200);
|
|
expect(resB.status).toBe(200);
|
|
|
|
const aJson = (await resA.json()) as {
|
|
data: { inserted: number; duplicates: number };
|
|
};
|
|
const bJson = (await resB.json()) as typeof aJson;
|
|
|
|
// Three unique tuples land in the DB after write-time dedup + the
|
|
// composite unique index: one survivor from A's minute-1/2 pair,
|
|
// one survivor from B's minute-21/22 pair, and one shared-key row
|
|
// (either as A's "inserted" or B's "inserted" — never both). The
|
|
// sum of the two batches' inserted counts equals the row count.
|
|
expect(aJson.data.inserted + bJson.data.inserted).toBe(3);
|
|
|
|
const stored = await getPrismaClient().workout.findMany({
|
|
where: { userId: TEST_USER_ID },
|
|
});
|
|
expect(stored).toHaveLength(3);
|
|
const sharedRows = stored.filter(
|
|
(r) => r.externalId === "hk-uuid-shared",
|
|
);
|
|
expect(sharedRows).toHaveLength(1);
|
|
});
|
|
});
|