diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml index 5c90a07fe..60b72dce6 100644 --- a/docs/api/openapi.yaml +++ b/docs/api/openapi.yaml @@ -41067,8 +41067,8 @@ components: id: type: string description: Measurement row id; `sleep:` for a sleep night; `day:` for a day bucket (`pulse` / - `glucose` beyond 90 days); `hour:` for an hour bucket (`pulse` within 90 days when the - window holds more than 10 000 readings). + `glucose` beyond 90 days); `hour:` for an hour bucket (`pulse` / `glucose` within 90 days + when the window holds more than 10 000 readings). at: type: string format: date-time @@ -41142,9 +41142,11 @@ components: additionalProperties: false description: "iOS-friendly per-kind time series: one point per reading (or per reconstructed night for `sleep`), an explicit `unit` token, and a summary `stats` block. Sample-dense kinds are bucketed server-side: `pulse` and - `glucose` beyond 90 days per local day, and `pulse` within 90 days per local hour when the window holds more - than 10 000 readings (a bucket carries the mean as `value` and its range as `valueMin` / `valueMax`). `stats` is - always computed over the underlying readings, never over the buckets." + `glucose` beyond 90 days per local day, and `pulse` / `glucose` within 90 days per local hour when the window + holds more than 10 000 readings (a continuous glucose sensor, a watch recording heart rate every minute; a cuff + or fingerstick meter stays raw). A bucket carries the mean as `value`; a `pulse` bucket also carries its range + as `valueMin` / `valueMax`, and a `glucose` bucket is converted to the user's unit like a raw reading. `stats` + is always computed over the underlying readings, never over the buckets." ListMeasurementsResponse: type: object properties: diff --git a/messages/de.json b/messages/de.json index 3bf26da63..dd4d78df9 100644 --- a/messages/de.json +++ b/messages/de.json @@ -533,7 +533,10 @@ "saveError": "Einnahme konnte nicht gespeichert werden.", "emptyTitle": "Noch keine Medikamente angelegt", "emptyDescription": "Lege zuerst ein Medikament mit Zeitfenster an, damit du die Einnahme protokollieren kannst.", - "emptyCta": "Medikament hinzufügen" + "emptyCta": "Medikament hinzufügen", + "noneActionableTitle": "Heute ist nichts einzunehmen", + "noneActionableDescription": "Deine Medikamente sind pausiert, sind nur dokumentiert, oder ihr Einnahmezeitraum hat noch nicht begonnen oder ist schon vorbei. Eine vergangene Einnahme kannst du weiterhin im Verlauf des Medikaments nachtragen.", + "noneActionableCta": "Zu den Medikamenten" }, "quickEntryDiscard": { "title": "Eintrag verwerfen?", diff --git a/messages/en.json b/messages/en.json index 36f4e379b..392b4bf32 100644 --- a/messages/en.json +++ b/messages/en.json @@ -533,7 +533,10 @@ "saveError": "Could not save medication intake.", "emptyTitle": "No medications yet", "emptyDescription": "Create a medication with a schedule first, then come back here to log the intake.", - "emptyCta": "Add medication" + "emptyCta": "Add medication", + "noneActionableTitle": "Nothing to take today", + "noneActionableDescription": "Your medications are paused, kept as a record, or their course has not started or has already ended. A past dose can still be added from a medication's history.", + "noneActionableCta": "Open medications" }, "quickEntryDiscard": { "title": "Discard this entry?", diff --git a/messages/es.json b/messages/es.json index 017d2e1d5..2fd4f529b 100644 --- a/messages/es.json +++ b/messages/es.json @@ -533,7 +533,10 @@ "saveError": "No se ha podido guardar la toma.", "emptyTitle": "Aún no hay medicamentos", "emptyDescription": "Crea primero un medicamento con horario, después vuelve aquí para registrar la toma.", - "emptyCta": "Añadir medicamento" + "emptyCta": "Añadir medicamento", + "noneActionableTitle": "Nada que tomar hoy", + "noneActionableDescription": "Tus medicamentos están en pausa, se guardan solo como registro, o su tratamiento aún no ha empezado o ya ha terminado. Puedes seguir añadiendo una toma pasada desde el historial del medicamento.", + "noneActionableCta": "Abrir medicamentos" }, "quickEntryDiscard": { "title": "¿Descartar esta entrada?", diff --git a/messages/fr.json b/messages/fr.json index 98facee44..3b0541a47 100644 --- a/messages/fr.json +++ b/messages/fr.json @@ -533,7 +533,10 @@ "saveError": "Impossible d’enregistrer la prise.", "emptyTitle": "Aucun médicament pour l’instant", "emptyDescription": "Crée d’abord un médicament avec un horaire, puis reviens ici pour saisir la prise.", - "emptyCta": "Ajouter un médicament" + "emptyCta": "Ajouter un médicament", + "noneActionableTitle": "Rien à prendre aujourd’hui", + "noneActionableDescription": "Tes médicaments sont en pause, conservés comme simple fiche, ou leur traitement n’a pas encore commencé ou est déjà terminé. Tu peux toujours ajouter une prise passée depuis l’historique du médicament.", + "noneActionableCta": "Ouvrir les médicaments" }, "quickEntryDiscard": { "title": "Abandonner cette saisie ?", diff --git a/messages/it.json b/messages/it.json index 0684fb266..1e34f37d1 100644 --- a/messages/it.json +++ b/messages/it.json @@ -533,7 +533,10 @@ "saveError": "Impossibile salvare l’assunzione.", "emptyTitle": "Ancora nessun farmaco", "emptyDescription": "Crea prima un farmaco con un orario, poi torna qui per registrarne l’assunzione.", - "emptyCta": "Aggiungi farmaco" + "emptyCta": "Aggiungi farmaco", + "noneActionableTitle": "Niente da prendere oggi", + "noneActionableDescription": "I tuoi farmaci sono in pausa, conservati solo come scheda, oppure la terapia non è ancora iniziata o è già terminata. Puoi comunque aggiungere un’assunzione passata dalla cronologia del farmaco.", + "noneActionableCta": "Apri i farmaci" }, "quickEntryDiscard": { "title": "Scartare questa voce?", diff --git a/messages/ko.json b/messages/ko.json index 3ee9e1863..15d3eb128 100644 --- a/messages/ko.json +++ b/messages/ko.json @@ -533,7 +533,10 @@ "saveError": "복용 기록을 저장하지 못했어요.", "emptyTitle": "등록된 약이 없어요", "emptyDescription": "먼저 일정이 있는 약을 만든 뒤, 여기로 돌아와 복용을 기록하세요.", - "emptyCta": "약 추가" + "emptyCta": "약 추가", + "noneActionableTitle": "오늘 복용할 약이 없어요", + "noneActionableDescription": "약이 일시 중지되었거나 기록용으로만 보관 중이거나, 복용 기간이 아직 시작되지 않았거나 이미 끝났어요. 지난 복용은 약의 기록에서 계속 추가할 수 있어요.", + "noneActionableCta": "약 목록 열기" }, "quickEntryDiscard": { "title": "이 기록을 버릴까요?", diff --git a/messages/pl.json b/messages/pl.json index 1af85caee..05d9faef2 100644 --- a/messages/pl.json +++ b/messages/pl.json @@ -533,7 +533,10 @@ "saveError": "Nie udało się zapisać przyjęcia.", "emptyTitle": "Brak leków", "emptyDescription": "Najpierw dodaj lek z harmonogramem, a potem wróć tutaj, aby zarejestrować jego przyjęcie.", - "emptyCta": "Dodaj lek" + "emptyCta": "Dodaj lek", + "noneActionableTitle": "Dziś nic do przyjęcia", + "noneActionableDescription": "Twoje leki są wstrzymane, zapisane tylko jako wpis albo ich kuracja jeszcze się nie zaczęła lub już się skończyła. Przeszłą dawkę nadal możesz dodać w historii leku.", + "noneActionableCta": "Otwórz leki" }, "quickEntryDiscard": { "title": "Odrzucić ten wpis?", diff --git a/src/app/api/measurements/series/__tests__/route.test.ts b/src/app/api/measurements/series/__tests__/route.test.ts index de6f8dced..cd220128a 100644 --- a/src/app/api/measurements/series/__tests__/route.test.ts +++ b/src/app/api/measurements/series/__tests__/route.test.ts @@ -631,6 +631,85 @@ describe("GET /api/measurements/series — dense-kind day-bucketing (v1.28.25)", expect(bucketSql.slice(1)).toContain("hour"); }); + it("hour-buckets a CGM glucose window too dense to send raw, in the user's unit", async () => { + vi.mocked(getSession).mockResolvedValue(SESSION_OK as never); + vi.mocked(prisma.user.findUnique).mockResolvedValue({ + glucoseUnit: "mmol/L", + } as never); + // A sensor reading every five minutes for 90 days. + vi.mocked(prisma.measurement.count).mockResolvedValue(25_920 as never); + vi.mocked(prisma.$queryRaw) + .mockResolvedValueOnce([ + { + bucket_start: new Date("2026-06-01T08:00:00Z"), + mean: 100, + min_value: 90, + max_value: 112, + }, + ] as never) + .mockResolvedValueOnce([ + { n: 25_920, mean: 118.004, min: 48, max: 260, sd: 36.004 }, + ] as never); + + const res = await GET(req("kind=glucose&days=90")); + expect(res.status).toBe(200); + const body = (await res.json()) as { + data: { + unit: string; + points: Array>; + stats: { + count: number; + mean: number; + min: number; + max: number; + stdDev: number; + }; + }; + }; + expect(prisma.measurement.findMany).not.toHaveBeenCalled(); + expect(vi.mocked(prisma.measurement.count).mock.calls[0]?.[0]).toEqual( + expect.objectContaining({ + where: expect.objectContaining({ type: "BLOOD_GLUCOSE" }), + }), + ); + expect(body.data.unit).toBe("mmol/L"); + // Converted once at serialization; no band on a glucose point. + expect(body.data.points).toEqual([ + { + id: "hour:2026-06-01T08:00:00.000Z", + at: "2026-06-01T08:00:00.000Z", + value: 5.5, + secondary: null, + }, + ]); + // Stats describe every reading (mg/dL aggregate, converted once). + expect(body.data.stats).toEqual({ + count: 25_920, + mean: 6.5, + min: 2.7, + max: 14.4, + stdDev: 2, + }); + const bucketSql = vi.mocked(prisma.$queryRaw).mock.calls[0] as unknown[]; + expect(bucketSql.slice(1)).toContain("hour"); + }); + + it("keeps fingerstick glucose at or under the row cap raw", async () => { + vi.mocked(getSession).mockResolvedValue(SESSION_OK as never); + vi.mocked(prisma.measurement.count).mockResolvedValue(360 as never); + vi.mocked(prisma.measurement.findMany).mockResolvedValue([ + { id: "g1", value: 104, measuredAt: new Date("2026-06-01T07:12:00Z") }, + ] as never); + const res = await GET(req("kind=glucose&days=90")); + const body = (await res.json()) as { + data: { points: Array> }; + }; + expect(prisma.$queryRaw).not.toHaveBeenCalled(); + expect(body.data.points).toEqual([ + { id: "g1", at: "2026-06-01T07:12:00.000Z", value: 104, secondary: null }, + ]); + }); + it("keeps a pulse window at or under the row cap raw", async () => { vi.mocked(getSession).mockResolvedValue(SESSION_OK as never); vi.mocked(prisma.measurement.count).mockResolvedValue(10_000 as never); diff --git a/src/app/api/measurements/series/route.ts b/src/app/api/measurements/series/route.ts index 80d5ed035..06d46e07a 100644 --- a/src/app/api/measurements/series/route.ts +++ b/src/app/api/measurements/series/route.ts @@ -52,17 +52,20 @@ const DENSE_SERIES_RAW_WINDOW_DAYS = 90; const DENSE_SERIES_KINDS: ReadonlySet = new Set(["glucose", "pulse"]); /** - * #1023 — inside the raw window, a pulse series with more rows than this is - * bucketed per local hour in SQL instead of sent raw. + * #1023 — inside the raw window, a pulse or glucose series with more rows + * than this is bucketed per local hour in SQL instead of sent raw. * * A watch that records heart rate once a minute puts 43 000 rows in the * default 30-day window and 130 000 in 90 days: a 15 MB response the client * could not draw at that resolution anyway, built from as many objects on the - * server. Hourly buckets carry the hour's mean with its low/high band, the - * shape an hourly-bucket import already has, and cap the answer at 24 points - * a day. The cap sits far above what sparse sources produce (a cuff, hourly - * buckets over 90 days, a watch sampling every five minutes over 30 days), so - * those series stay raw and unchanged. + * server. A CGM reading every five minutes puts 26 000 glucose rows in 90 + * days, the same problem at a smaller scale. Hourly buckets carry the hour's + * mean (pulse also its low/high band, the shape an hourly-bucket import + * already has) and cap the answer at 24 points a day; the statistics stay + * computed over every raw reading. The cap sits far above what sparse sources + * produce (a cuff, fingerstick glucose, hourly buckets over 90 days, a watch + * sampling every five minutes over 30 days), so those series stay raw and + * unchanged. */ const DENSE_SERIES_RAW_ROW_CAP = 10_000; @@ -368,18 +371,18 @@ export const GET = apiHandler(async (request: NextRequest) => { }); } else if ( (DENSE_SERIES_KINDS.has(kind) && days > DENSE_SERIES_RAW_WINDOW_DAYS) || - (kind === "pulse" && + (DENSE_SERIES_KINDS.has(kind) && (await prisma.measurement.count({ where: { userId: user.id, - type: "PULSE", + type: KIND_TO_TYPE[kind], measuredAt: { gte: since }, deletedAt: null, }, })) > DENSE_SERIES_RAW_ROW_CAP) ) { - // Day buckets past the raw window; hour buckets for a pulse stream too - // dense to send raw inside it. + // Day buckets past the raw window; hour buckets for a pulse or CGM + // stream too dense to send raw inside it. const grain = days > DENSE_SERIES_RAW_WINDOW_DAYS ? "day" : "hour"; // v1.28.25 — long-window read of a sample-dense kind (CGM glucose, // per-sample / hourly pulse). Day-bucket in SQL instead of walking diff --git a/src/components/dashboard/__tests__/medication-intake-quick-add.test.tsx b/src/components/dashboard/__tests__/medication-intake-quick-add.test.tsx index c953ec8e1..343bedae8 100644 --- a/src/components/dashboard/__tests__/medication-intake-quick-add.test.tsx +++ b/src/components/dashboard/__tests__/medication-intake-quick-add.test.tsx @@ -71,6 +71,7 @@ function makeMed( name: `Med ${id}`, dose: "5 mg", active: true, + intakeActionable: true, schedules: [], lastTakenAt: null, todayEventCount: 0, @@ -316,6 +317,48 @@ describe(" — SSR contract", () => { } }); + // #1040 — the picker offers what the server calls actionable, nothing + // it re-derives. An ended course is still `active` (nobody paused it), + // which is exactly the case the old `active && trackIntake` filter let + // through. + it("does not offer an ended course, even though it is still active (#1040)", () => { + mockUseQuery.mockReturnValue({ + data: [ + makeMed("ended", { + name: "Alpha", + active: true, + intakeActionable: false, + }), + makeMed("current", { name: "Zulu" }), + ], + isLoading: false, + }); + const html = renderSSR(); + // Alphabetical fallback would land on "Alpha" if it were offered. + expect(html).toMatch( + /data-slot="select-value"[^>]*>[\s\S]*?Zulu[\s\S]*?<\/span>/, + ); + expect(html).not.toContain("Alpha"); + }); + + it("shows the empty state when no medication is actionable today (#1040)", () => { + mockUseQuery.mockReturnValue({ + data: [ + makeMed("ended", { name: "Alpha", intakeActionable: false }), + makeMed("upcoming", { name: "Beta", intakeActionable: false }), + ], + isLoading: false, + }); + const html = renderSSR(); + expect(html).toContain('data-testid="medication-intake-quick-add-empty"'); + expect(html).not.toContain( + 'data-testid="medication-intake-quick-add-form"', + ); + // The user has medications, so "no medications yet" would be untrue. + expect(html).toContain("Nothing to take today"); + expect(html).not.toContain("No medications yet"); + }); + it("does not leak raw i18n keys in either locale", () => { mockUseQuery.mockReturnValue({ data: [], isLoading: false }); const en = renderSSR(, "en"); diff --git a/src/components/dashboard/medication-intake-quick-add.tsx b/src/components/dashboard/medication-intake-quick-add.tsx index 52788fd3a..29ae37927 100644 --- a/src/components/dashboard/medication-intake-quick-add.tsx +++ b/src/components/dashboard/medication-intake-quick-add.tsx @@ -81,8 +81,13 @@ interface Schedule extends ScheduleWindowInput { export interface MedicationOption extends DefaultMedicationOption { dose: string; schedules: Schedule[]; - /** v1.39.1 (#1033) — false: kept as a record, not offered for a dose. */ - trackIntake?: boolean; + /** + * The server's answer to "does this medication offer a dose today" + * (active, intake tracked, course includes today; see + * `src/lib/medications/intake-actionable.ts`). The list read always + * carries it, so the picker renders from it and re-derives nothing. + */ + intakeActionable: boolean; } interface MedicationIntakeQuickAddProps { @@ -141,9 +146,10 @@ export function MedicationIntakeQuickAdd({ const medications = useMemo( () => Array.isArray(medicationsRaw) - ? // v1.39.1 (#1033) — a medication with intake tracking off is - // kept as a record; the dose capture does not offer it. - medicationsRaw.filter((m) => m.active && m.trackIntake !== false) + ? // #1040 — offer exactly what the cards, the table and "take + // all" offer: a paused, record-only, not-yet-started or ended + // course is not a dose to capture now. + medicationsRaw.filter((m) => m.intakeActionable === true) : [], [medicationsRaw], ); @@ -314,6 +320,10 @@ export function MedicationIntakeQuickAdd({ // anlegen` so the footer-slot promise holds across both // branches. if (!medicationsLoading && medications.length === 0) { + // Medications exist, none offers a dose today: say that, rather than + // "no medications yet", which would be untrue. + const noneActionable = + Array.isArray(medicationsRaw) && medicationsRaw.length > 0; const emptyFooter = (
{onCancel && ( @@ -328,7 +338,9 @@ export function MedicationIntakeQuickAdd({ )}
@@ -344,10 +356,16 @@ export function MedicationIntakeQuickAdd({