mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-17 23:52:24 +00:00
release: v1.32.0 — hardening and scalability (#580)
* release: prepare v1.32.0 * test: stabilize water capture re-entry
This commit is contained in:
1 parent
b01822be48
commit
62eb431d66
372 files changed
+25178
-8561
No files matched your search
@@ -6,13 +6,13 @@ process.env.ENCRYPTION_KEY =
|
||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
|
||||
|
||||
const mocks = vi.hoisted(() => ({
|
||||
findMeasurementsPaged: vi.fn(),
|
||||
iterateMeasurementPages: vi.fn(),
|
||||
buildCycleBackupSection: vi.fn(),
|
||||
buildRecordsBackupSection: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("@/lib/export/paged-measurements", () => ({
|
||||
findMeasurementsPaged: mocks.findMeasurementsPaged,
|
||||
iterateMeasurementPages: mocks.iterateMeasurementPages,
|
||||
}));
|
||||
vi.mock("@/lib/cycle/backup", () => ({
|
||||
buildCycleBackupSection: mocks.buildCycleBackupSection,
|
||||
@@ -181,30 +181,38 @@ function makePrisma() {
|
||||
|
||||
function installSectionMocks() {
|
||||
void measurementNote;
|
||||
mocks.findMeasurementsPaged.mockResolvedValue([
|
||||
{
|
||||
id: "measurement-tombstone",
|
||||
type: "SLEEP_DURATION",
|
||||
value: 75,
|
||||
valueMin: 60,
|
||||
valueMax: 90,
|
||||
unit: "minutes",
|
||||
measuredAt: new Date("2026-07-19T07:00:00.000Z"),
|
||||
source: "IMPORT",
|
||||
notes: null,
|
||||
notesEncrypted: measurementNote,
|
||||
externalId: "oura-stage-deep",
|
||||
externalSourceVersion: "oura-v3",
|
||||
glucoseContext: null,
|
||||
sleepStage: "DEEP",
|
||||
rhythmClassification: null,
|
||||
deviceType: "ring",
|
||||
syncVersion: 7,
|
||||
deletedAt,
|
||||
createdAt: new Date("2026-07-19T07:01:00.000Z"),
|
||||
updatedAt: new Date("2026-07-19T07:02:00.000Z"),
|
||||
},
|
||||
]);
|
||||
const measurement = {
|
||||
id: "measurement-tombstone",
|
||||
type: "SLEEP_DURATION",
|
||||
value: 75,
|
||||
valueMin: 60,
|
||||
valueMax: 90,
|
||||
unit: "minutes",
|
||||
measuredAt: new Date("2026-07-19T07:00:00.000Z"),
|
||||
source: "IMPORT",
|
||||
notes: null,
|
||||
notesEncrypted: measurementNote,
|
||||
externalId: "oura-stage-deep",
|
||||
externalSourceVersion: "oura-v3",
|
||||
glucoseContext: null,
|
||||
sleepStage: "DEEP",
|
||||
rhythmClassification: null,
|
||||
deviceType: "ring",
|
||||
syncVersion: 7,
|
||||
deletedAt,
|
||||
createdAt: new Date("2026-07-19T07:01:00.000Z"),
|
||||
updatedAt: new Date("2026-07-19T07:02:00.000Z"),
|
||||
};
|
||||
mocks.iterateMeasurementPages.mockImplementation(async function* () {
|
||||
yield [measurement];
|
||||
yield [
|
||||
{
|
||||
...measurement,
|
||||
id: "measurement-page-2",
|
||||
measuredAt: new Date("2026-07-18T07:00:00.000Z"),
|
||||
},
|
||||
];
|
||||
});
|
||||
mocks.buildCycleBackupSection.mockResolvedValue({
|
||||
cycleProfile: null,
|
||||
cycles: [],
|
||||
@@ -223,10 +231,11 @@ function installSectionMocks() {
|
||||
workouts: { included: "summary-only", note: "included" },
|
||||
},
|
||||
});
|
||||
return measurement;
|
||||
}
|
||||
|
||||
describe("buildFullBackupPayload disaster-recovery mode", () => {
|
||||
it("preserves measurement and mood tombstones with stable ids", async () => {
|
||||
it("preserves tombstones while consuming measurement pages into the final payload", async () => {
|
||||
installSectionMocks();
|
||||
const prisma = makePrisma();
|
||||
|
||||
@@ -239,7 +248,7 @@ describe("buildFullBackupPayload disaster-recovery mode", () => {
|
||||
},
|
||||
);
|
||||
|
||||
expect(mocks.findMeasurementsPaged).toHaveBeenCalledWith(
|
||||
expect(mocks.iterateMeasurementPages).toHaveBeenCalledWith(
|
||||
prisma,
|
||||
{ userId: "user-1" },
|
||||
expect.objectContaining({ id: true, deletedAt: true }),
|
||||
@@ -287,6 +296,10 @@ describe("buildFullBackupPayload disaster-recovery mode", () => {
|
||||
createdAt: "2026-07-19T07:01:00.000Z",
|
||||
updatedAt: "2026-07-19T07:02:00.000Z",
|
||||
},
|
||||
{
|
||||
id: "measurement-page-2",
|
||||
measuredAt: "2026-07-18T07:00:00.000Z",
|
||||
},
|
||||
],
|
||||
medications: [
|
||||
expect.objectContaining({
|
||||
@@ -323,4 +336,19 @@ describe("buildFullBackupPayload disaster-recovery mode", () => {
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it("propagates a failure from a later measurement page", async () => {
|
||||
const measurement = installSectionMocks();
|
||||
const failure = new Error("backup measurement page failed");
|
||||
mocks.iterateMeasurementPages.mockImplementation(async function* () {
|
||||
yield [measurement];
|
||||
throw failure;
|
||||
});
|
||||
|
||||
await expect(
|
||||
buildFullBackupPayload(makePrisma() as never, "user-1", {
|
||||
purpose: "disaster-recovery",
|
||||
}),
|
||||
).rejects.toBe(failure);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,207 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import {
|
||||
reconstructSleepSessions,
|
||||
type SleepStageRow,
|
||||
} from "@/lib/analytics/sleep-night";
|
||||
import {
|
||||
groupMeasurementPagesForExport,
|
||||
iterateMeasurementPages,
|
||||
} from "../paged-measurements";
|
||||
|
||||
function row(id: string, measuredAt: string) {
|
||||
return { id, measuredAt: new Date(measuredAt) };
|
||||
}
|
||||
|
||||
describe("iterateMeasurementPages", () => {
|
||||
it("yields bounded keyset pages without retaining them in one result", async () => {
|
||||
const first = [
|
||||
row("m-3", "2026-07-21T12:00:00.000Z"),
|
||||
row("m-2", "2026-07-21T12:00:00.000Z"),
|
||||
];
|
||||
const second = [row("m-1", "2026-07-20T12:00:00.000Z")];
|
||||
const findMany = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce(first)
|
||||
.mockResolvedValueOnce(second);
|
||||
const db = { measurement: { findMany } };
|
||||
|
||||
const iterator = iterateMeasurementPages(
|
||||
db as never,
|
||||
{ userId: "user-1" },
|
||||
{ id: true, measuredAt: true },
|
||||
2,
|
||||
)[Symbol.asyncIterator]();
|
||||
|
||||
await expect(iterator.next()).resolves.toEqual({
|
||||
done: false,
|
||||
value: first,
|
||||
});
|
||||
expect(findMany).toHaveBeenCalledTimes(1);
|
||||
await expect(iterator.next()).resolves.toEqual({
|
||||
done: false,
|
||||
value: second,
|
||||
});
|
||||
expect(findMany).toHaveBeenCalledTimes(2);
|
||||
await expect(iterator.next()).resolves.toEqual({
|
||||
done: true,
|
||||
value: undefined,
|
||||
});
|
||||
expect(findMany).toHaveBeenNthCalledWith(1, {
|
||||
where: { userId: "user-1" },
|
||||
orderBy: [{ measuredAt: "desc" }, { id: "desc" }],
|
||||
take: 2,
|
||||
select: { id: true, measuredAt: true },
|
||||
});
|
||||
expect(findMany).toHaveBeenNthCalledWith(2, {
|
||||
where: { userId: "user-1" },
|
||||
orderBy: [{ measuredAt: "desc" }, { id: "desc" }],
|
||||
take: 2,
|
||||
cursor: { id: "m-2" },
|
||||
skip: 1,
|
||||
select: { id: true, measuredAt: true },
|
||||
});
|
||||
});
|
||||
|
||||
it("does not yield an empty terminal page after a full page", async () => {
|
||||
const full = [
|
||||
row("m-2", "2026-07-21T12:00:00.000Z"),
|
||||
row("m-1", "2026-07-20T12:00:00.000Z"),
|
||||
];
|
||||
const findMany = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce(full)
|
||||
.mockResolvedValueOnce([]);
|
||||
const db = { measurement: { findMany } };
|
||||
|
||||
const pages = [];
|
||||
for await (const page of iterateMeasurementPages(
|
||||
db as never,
|
||||
{},
|
||||
{ id: true, measuredAt: true },
|
||||
2,
|
||||
)) {
|
||||
pages.push(page);
|
||||
}
|
||||
|
||||
expect(pages).toEqual([full]);
|
||||
expect(findMany).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
it("propagates a database failure after releasing the prior page", async () => {
|
||||
const failure = new Error("page two failed");
|
||||
const findMany = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce([
|
||||
row("m-2", "2026-07-21T12:00:00.000Z"),
|
||||
row("m-1", "2026-07-20T12:00:00.000Z"),
|
||||
])
|
||||
.mockRejectedValueOnce(failure);
|
||||
const db = { measurement: { findMany } };
|
||||
const iterator = iterateMeasurementPages(
|
||||
db as never,
|
||||
{},
|
||||
{ id: true, measuredAt: true },
|
||||
2,
|
||||
)[Symbol.asyncIterator]();
|
||||
|
||||
await expect(iterator.next()).resolves.toMatchObject({ done: false });
|
||||
await expect(iterator.next()).rejects.toBe(failure);
|
||||
});
|
||||
|
||||
it("stops querying when the consumer cancels after one page", async () => {
|
||||
const findMany = vi
|
||||
.fn()
|
||||
.mockResolvedValue([
|
||||
row("m-2", "2026-07-21T12:00:00.000Z"),
|
||||
row("m-1", "2026-07-20T12:00:00.000Z"),
|
||||
]);
|
||||
const db = { measurement: { findMany } };
|
||||
const iterator = iterateMeasurementPages(
|
||||
db as never,
|
||||
{},
|
||||
{ id: true, measuredAt: true },
|
||||
2,
|
||||
)[Symbol.asyncIterator]();
|
||||
|
||||
await iterator.next();
|
||||
await iterator.return?.();
|
||||
|
||||
expect(findMany).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("keeps a sleep wake-day carry intact across database page boundaries", async () => {
|
||||
const newer = {
|
||||
type: "WEIGHT",
|
||||
value: 80,
|
||||
measuredAt: new Date("2026-07-21T09:00:00.000Z"),
|
||||
};
|
||||
const rem = {
|
||||
type: "SLEEP_DURATION",
|
||||
value: 60,
|
||||
measuredAt: new Date("2026-07-21T08:00:00.000Z"),
|
||||
};
|
||||
const deep = {
|
||||
type: "SLEEP_DURATION",
|
||||
value: 60,
|
||||
measuredAt: new Date("2026-07-21T07:00:00.000Z"),
|
||||
};
|
||||
const older = {
|
||||
type: "WEIGHT",
|
||||
value: 79,
|
||||
measuredAt: new Date("2026-07-20T00:00:00.000Z"),
|
||||
};
|
||||
async function* pages() {
|
||||
yield [newer, rem];
|
||||
yield [deep, older];
|
||||
}
|
||||
|
||||
const groups = [];
|
||||
for await (const group of groupMeasurementPagesForExport(
|
||||
pages(),
|
||||
"UTC",
|
||||
"night",
|
||||
)) {
|
||||
groups.push(group);
|
||||
}
|
||||
|
||||
expect(groups).toEqual([[newer], [rem, deep], [older]]);
|
||||
});
|
||||
|
||||
it("keeps a contiguous cross-midnight stage together across pages", async () => {
|
||||
const crossMidnight = {
|
||||
type: "SLEEP_DURATION",
|
||||
value: 240,
|
||||
measuredAt: new Date("2026-07-21T02:00:00.000Z"),
|
||||
sleepStage: "CORE" as const,
|
||||
};
|
||||
const precedingStage = {
|
||||
type: "SLEEP_DURATION",
|
||||
value: 60,
|
||||
measuredAt: new Date("2026-07-20T22:00:00.000Z"),
|
||||
sleepStage: "DEEP" as const,
|
||||
};
|
||||
const older = {
|
||||
type: "WEIGHT",
|
||||
value: 80,
|
||||
measuredAt: new Date("2026-07-19T12:00:00.000Z"),
|
||||
};
|
||||
const sleepRows: SleepStageRow[] = [crossMidnight, precedingStage];
|
||||
expect(reconstructSleepSessions(sleepRows, "UTC")).toHaveLength(1);
|
||||
|
||||
async function* pages() {
|
||||
yield [crossMidnight];
|
||||
yield [precedingStage, older];
|
||||
}
|
||||
|
||||
const groups = [];
|
||||
for await (const group of groupMeasurementPagesForExport(
|
||||
pages(),
|
||||
"UTC",
|
||||
"night",
|
||||
)) {
|
||||
groups.push(group);
|
||||
}
|
||||
|
||||
expect(groups).toEqual([[crossMidnight, precedingStage], [older]]);
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user