mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-12 14:16:12 +00:00
Eleven touch-disjoint waves landed on develop plus a six-axis QA reconcile round before tagging. See CHANGELOG.md for the user-facing prose; this commit message documents the wave + report inventory for release-management traceability. Waves shipped (each with a phase report under .planning/): - phase-W-POOL-v1440-report.md — p-limit(4) wrapper around the analytics 15-way fan-out + pg.Pool max raised 10 -> 20. Closes the v1.4.39 empirical-trace finding #1 (Prisma pool starvation). - phase-W-DELETED-v1440-report.md — 11 reader-tier helpers + 3 integration contracts close audit Critical Finding #3 (soft-delete invisibility) across dashboard, analytics, summaries, rollup tiers, and the Coach snapshot path. - phase-W-INSIGHTS-v1440-report.md — mood-rollup swap on the three /api/insights/{features,targets,cards} routes plus the compliance-rollup hook gap closure for bulk-projection mints; the post-QA reconcile patch closes the six remaining measurement.findMany sites in the cluster that still leaked tombstoned rows. - phase-W-INFRA-v1440-report.md — rollup helper umbrella consolidation under src/lib/rollups/* with zero orphan re-exports; lint, typecheck, knip, and 93/93 rollup tests green post-restructure. - phase-W-RSC-v1440-report.md — per-tile Suspense boundaries plus the queryKey factory-bypass walker test (extended to comparison/ in the reconcile pass). - phase-W-PRIVACY-v1440-report.md — bilingual /privacy page with 17 paired-section tests pinning the 9 SB-3 disclosure requirements. - phase-W-AASA-v1440-report.md — /.well-known/apple-app-site-association endpoint pinned to S8WDX4W5KX.dev.healthlog.app with app-ID parity assertions guarding against split rotation. - phase-W-APNS-NOTIFY-v1440-report.md — MEDICATION_REMINDER time-sensitive APNs payload (priority 10 + interruption-level) scoped via a parameterised test that pins all 6 other event-types do not bypass Focus. AP-2 .p8 install gates real delivery. - phase-W-CONSENT-v1440-report.md — AI consent receipts CRUD with append-only invariant pinned in test; revoke-then-regrant leaves both rows; idempotent DELETE returns 200 + receipt: null. - phase-W-WMY-WIRE-v1440-report.md — three previously-dead WMY readers (week/month/year) wired through summaries-slice and health-score-fast-path with a linear-composability parity test pinning the cross-consumer routing contract. - phase-W-GHOSTS-v1440-report.md — ~1 177 lines of dead code removed across 9 atomic commits; startOfUtcDay + wallClockInTz consolidation eliminates a sibling-drift risk; knip whitelist trimmed to three files pending follow-up. QA reconcile patches applied per the v1.4.40 QA round (six reports under .planning/round-v1440-QA-*-findings.md): - senior C1 — dashboard-suspense-boundaries regex aligned with the post-W-INFRA Thread 2 userTimezone-local lift. - senior H1 — soft-delete filter added to the six remaining insights measurement.findMany sites. - specialist H1 — Promise.allSettled around bulk-projection compliance recompute on both /api/medications/intake and /api/dashboard/summary. - ux H1 — compare-toggle migrated to queryKeys.dashboardWidgets factory; walker test extended to src/components/comparison/. - security M1 — consent artefact 64 KB cap enforced via Buffer.byteLength (UTF-8 bytes, not UTF-16 code units). Quality gates green at tag: pnpm typecheck, pnpm lint, pnpm knip --include files,dependencies,binaries,unlisted, pnpm test --run (4726 passing / 1 skipped). Tests 4525 -> 4726 unit + 1 skipped over the v1.4.39 -> v1.4.40 span. User-facing prose: see CHANGELOG.md.
423 lines
15 KiB
TypeScript
423 lines
15 KiB
TypeScript
/**
|
|
* Top-level medication-intake aggregator + writer.
|
|
*
|
|
* GET /api/medications/intake?scope=today
|
|
* → array of today's intake events for the user (across medications).
|
|
*
|
|
* GET /api/medications/intake?scope=compliance&days=N
|
|
* → per-day { date, scheduled, taken } for the last N days.
|
|
*
|
|
* POST /api/medications/intake
|
|
* Body: { intakeId, status: "taken" | "skipped" | "snoozed", takenAt?, snoozedUntil? }
|
|
* Updates the named MedicationIntakeEvent and returns the updated row.
|
|
*/
|
|
import { NextRequest } from "next/server";
|
|
import { z } from "zod/v4";
|
|
import { apiHandler, requireAuth } from "@/lib/api-handler";
|
|
import {
|
|
apiError,
|
|
apiSuccess,
|
|
getClientIp,
|
|
safeJson,
|
|
} from "@/lib/api-response";
|
|
import { annotate } from "@/lib/logging/context";
|
|
import { prisma } from "@/lib/db";
|
|
import { auditLog } from "@/lib/auth/audit";
|
|
import { userDayKey, DEFAULT_TIMEZONE } from "@/lib/tz/resolver";
|
|
import { cached, caches, type ServerCache } from "@/lib/cache/server-cache";
|
|
import { invalidateUserMedications } from "@/lib/cache/invalidate";
|
|
import {
|
|
readMedicationCompliance,
|
|
hasMedicationComplianceCoverage,
|
|
recomputeMedicationComplianceForEvent,
|
|
enqueueUserMedicationComplianceBackfill,
|
|
type ComplianceBucket as RollupComplianceBucket,
|
|
} from "@/lib/rollups/medication-compliance-rollups";
|
|
import { expandTodayIntakes } from "@/lib/medication-schedule";
|
|
|
|
const querySchema = z.object({
|
|
scope: z.enum(["today", "compliance"]),
|
|
days: z.coerce.number().int().min(1).max(365).optional().default(30),
|
|
});
|
|
|
|
const updateSchema = z.object({
|
|
intakeId: z.string().min(1),
|
|
status: z.enum(["taken", "skipped", "snoozed"]),
|
|
takenAt: z.iso
|
|
.datetime({ offset: true })
|
|
.transform((s) => new Date(s))
|
|
.optional(),
|
|
snoozedUntil: z.iso
|
|
.datetime({ offset: true })
|
|
.transform((s) => new Date(s))
|
|
.optional(),
|
|
});
|
|
|
|
function startOfDayInTz(date: Date, tz: string): Date {
|
|
const parts = new Intl.DateTimeFormat("en-US", {
|
|
timeZone: tz,
|
|
year: "numeric",
|
|
month: "2-digit",
|
|
day: "2-digit",
|
|
}).formatToParts(date);
|
|
const y = parts.find((p) => p.type === "year")?.value ?? "1970";
|
|
const m = parts.find((p) => p.type === "month")?.value ?? "01";
|
|
const d = parts.find((p) => p.type === "day")?.value ?? "01";
|
|
return new Date(`${y}-${m}-${d}T00:00:00.000Z`);
|
|
}
|
|
|
|
export const GET = apiHandler(async (request: NextRequest) => {
|
|
const { user } = await requireAuth();
|
|
|
|
const parsed = querySchema.safeParse(
|
|
Object.fromEntries(request.nextUrl.searchParams),
|
|
);
|
|
if (!parsed.success) {
|
|
return apiError(parsed.error.issues[0].message, 422);
|
|
}
|
|
|
|
const { scope, days } = parsed.data;
|
|
|
|
// v1.4.25 W7b — anchor "today" and per-day compliance buckets to the
|
|
// user's display timezone so a 23:30 reading in Pacific/Auckland lands
|
|
// in today's bucket rather than yesterday's Berlin one.
|
|
const userTz = user.timezone ?? DEFAULT_TIMEZONE;
|
|
|
|
if (scope === "today") {
|
|
const todayStart = startOfDayInTz(new Date(), userTz);
|
|
const todayEnd = new Date(todayStart.getTime() + 86_400_000);
|
|
|
|
// v1.4.39 W-SERVER-FIX — project pending intake rows for every
|
|
// active schedule whose window opens today, then idempotently
|
|
// backfill any missing rows. Pre-fix the endpoint returned `[]`
|
|
// for daily meds (`schedule.daysOfWeek = null` in the DB) until
|
|
// the reminder worker entered the RED phase at the end of the
|
|
// dose window — leaving the iOS Dashboard tile + the "Erfassen"
|
|
// sheet empty for the whole morning. The projection re-uses the
|
|
// canonical `parseScheduleRecurrence` (null/empty = every day)
|
|
// so the daysOfWeek semantics stay aligned across every reader.
|
|
const activeMedications = await prisma.medication.findMany({
|
|
where: { userId: user.id, active: true },
|
|
select: {
|
|
id: true,
|
|
schedules: {
|
|
select: {
|
|
id: true,
|
|
medicationId: true,
|
|
windowStart: true,
|
|
windowEnd: true,
|
|
daysOfWeek: true,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
const projected = expandTodayIntakes(
|
|
activeMedications.flatMap((m) => m.schedules),
|
|
new Date(),
|
|
userTz,
|
|
);
|
|
|
|
const existing = await prisma.medicationIntakeEvent.findMany({
|
|
where: {
|
|
userId: user.id,
|
|
scheduledFor: { gte: todayStart, lt: todayEnd },
|
|
},
|
|
select: { medicationId: true, scheduledFor: true },
|
|
});
|
|
const existingKey = new Set(
|
|
existing.map((e) => `${e.medicationId}|${e.scheduledFor.toISOString()}`),
|
|
);
|
|
const missing = projected.filter(
|
|
(p) =>
|
|
!existingKey.has(`${p.medicationId}|${p.scheduledFor.toISOString()}`),
|
|
);
|
|
if (missing.length > 0) {
|
|
await prisma.medicationIntakeEvent.createMany({
|
|
data: missing.map((m) => ({
|
|
userId: user.id,
|
|
medicationId: m.medicationId,
|
|
scheduledFor: m.scheduledFor,
|
|
takenAt: null,
|
|
skipped: false,
|
|
// `REMINDER` is the same source the reminder worker uses to
|
|
// mint RED-phase rows — semantically "the server projected
|
|
// this slot before the user logged anything". The IntakeSource
|
|
// enum has no separate `SCHEDULER` literal; reusing REMINDER
|
|
// keeps the doctor-report + analytics filters byte-stable.
|
|
source: "REMINDER",
|
|
})),
|
|
// v1.4.39 W-SERVER-FIX-2 — paired with the schema-level
|
|
// @@unique([userId, medicationId, scheduledFor, source]). A
|
|
// concurrent dashboard-summary hit (the second route that now
|
|
// runs the same projection) can race a duplicate row in
|
|
// between this route's existence probe and createMany; the
|
|
// flag tells Postgres to swallow the rejected rows so the
|
|
// request still returns 2xx. The unique constraint is the
|
|
// structural backstop, this is the defense-in-depth.
|
|
skipDuplicates: true,
|
|
});
|
|
|
|
// v1.4.40 — close the compliance-rollup hook gap from v1.4.39.4.
|
|
// The bulk projection mints fresh `(medicationId, scheduledFor)`
|
|
// rows in PENDING state; without this hook the rollup for the
|
|
// affected `(user, medication, day)` tuples stays at its previous
|
|
// (pre-projection) `scheduled` count, which inflates the apparent
|
|
// compliance % until the user actually logs against the new
|
|
// row. Coalesce by `(medicationId, dayKey)` so we fire one
|
|
// recompute per distinct day-tuple instead of one per row.
|
|
// Best-effort: errors stay caught inside the helper so a
|
|
// populator hiccup doesn't surface as a 5xx on the intake
|
|
// request. Mirror call site in `dashboard/summary/route.ts`.
|
|
const seenDayKeys = new Set<string>();
|
|
const recomputeJobs: Array<Promise<void>> = [];
|
|
for (const m of missing) {
|
|
const key = `${m.medicationId}|${m.scheduledFor.toISOString().slice(0, 10)}`;
|
|
if (seenDayKeys.has(key)) continue;
|
|
seenDayKeys.add(key);
|
|
recomputeJobs.push(
|
|
recomputeMedicationComplianceForEvent({
|
|
userId: user.id,
|
|
medicationId: m.medicationId,
|
|
scheduledFor: m.scheduledFor,
|
|
tz: userTz,
|
|
}),
|
|
);
|
|
}
|
|
// Defence in depth (specialist H1): the helper swallows internally
|
|
// today, but any future refactor that lets a throw escape would
|
|
// turn the intake POST into a 5xx. `allSettled` keeps the
|
|
// best-effort contract explicit at the call site so the request
|
|
// stays 200-OK regardless of helper behaviour.
|
|
await Promise.allSettled(recomputeJobs);
|
|
}
|
|
|
|
const events = await prisma.medicationIntakeEvent.findMany({
|
|
where: {
|
|
userId: user.id,
|
|
scheduledFor: { gte: todayStart, lt: todayEnd },
|
|
},
|
|
orderBy: { scheduledFor: "asc" },
|
|
include: { medication: { select: { id: true, snoozedUntil: true } } },
|
|
});
|
|
|
|
annotate({
|
|
action: { name: "medications.intake.today" },
|
|
meta: {
|
|
count: events.length,
|
|
projected: projected.length,
|
|
backfilled: missing.length,
|
|
},
|
|
});
|
|
|
|
return apiSuccess(
|
|
events.map((e) => ({
|
|
id: e.id,
|
|
medicationId: e.medicationId,
|
|
scheduledAt: e.scheduledFor.toISOString(),
|
|
takenAt: e.takenAt?.toISOString() ?? null,
|
|
status: e.skipped
|
|
? "skipped"
|
|
: e.takenAt
|
|
? "taken"
|
|
: e.medication.snoozedUntil &&
|
|
e.medication.snoozedUntil > new Date()
|
|
? "snoozed"
|
|
: "pending",
|
|
snoozedUntil: e.medication.snoozedUntil?.toISOString() ?? null,
|
|
})),
|
|
);
|
|
}
|
|
|
|
// v1.4.34 IW-G — compliance: per-day scheduled vs taken for the last
|
|
// N days. Cached at a 15-minute TTL because daily compliance buckets
|
|
// are slow-moving (intake events trickle in, yesterday's row doesn't
|
|
// move). Cache key carries the userTz so a user who changes timezone
|
|
// doesn't read another tz's bucketing.
|
|
//
|
|
// v1.4.39 W-MED — read path now consumes the persistent
|
|
// `medication_compliance_rollups` tier. A coverage probe falls back
|
|
// to the legacy live aggregator when the user has intake events but
|
|
// zero rollup rows; the fallback fires a boot-backfill enqueue in the
|
|
// background so the next request hits the rollup tier.
|
|
const result = await cached(
|
|
caches.medicationsIntake as ServerCache<ComplianceBucket[]>,
|
|
`${user.id}|compliance|${days}|${userTz}`,
|
|
() => readComplianceBucketsWithFallback(user.id, days, userTz),
|
|
annotate,
|
|
);
|
|
|
|
annotate({
|
|
action: { name: "medications.intake.compliance" },
|
|
meta: { days, count: result.length },
|
|
});
|
|
|
|
return apiSuccess(result);
|
|
});
|
|
|
|
/**
|
|
* v1.4.39 W-MED — read from the persistent rollup tier when covered,
|
|
* fall through to the legacy live aggregator on coverage miss. The
|
|
* fallback fires the boot backfill in the background so subsequent
|
|
* requests hit the rollup path; the current request still returns a
|
|
* correct response built from the raw events.
|
|
*/
|
|
async function readComplianceBucketsWithFallback(
|
|
userId: string,
|
|
days: number,
|
|
userTz: string,
|
|
): Promise<ComplianceBucket[]> {
|
|
const covered = await hasMedicationComplianceCoverage(userId, days, userTz);
|
|
if (covered) {
|
|
const buckets = await readMedicationCompliance(userId, days, userTz);
|
|
annotate({
|
|
meta: {
|
|
medication_compliance_path: "rollup",
|
|
medication_compliance_days: days,
|
|
},
|
|
});
|
|
return buckets satisfies RollupComplianceBucket[];
|
|
}
|
|
|
|
// Coverage miss — the legacy aggregator stays correct over an empty
|
|
// rollup window. Fire a user-scoped backfill in the background so
|
|
// the next request lands on the rollup tier; the current request
|
|
// still returns the live-derived buckets.
|
|
//
|
|
// QA F-SEC-M-01 (v1.4.39): pre-fix this fired the cluster-wide
|
|
// `enqueueBootTimeMedicationComplianceBackfill` on every coverage-
|
|
// miss request, opening a soft-DoS amplifier (every authenticated
|
|
// user could drive a multi-tenant `LEFT JOIN` scan on each hit).
|
|
// The user-scoped helper enqueues exactly the caller's account.
|
|
void enqueueUserMedicationComplianceBackfill(userId);
|
|
annotate({
|
|
meta: {
|
|
medication_compliance_path: "live-fallback",
|
|
medication_compliance_days: days,
|
|
},
|
|
});
|
|
return buildComplianceBuckets(userId, days, userTz);
|
|
}
|
|
|
|
interface ComplianceBucket {
|
|
date: string;
|
|
scheduled: number;
|
|
taken: number;
|
|
}
|
|
|
|
/**
|
|
* v1.4.34 IW-G — pulled out of the GET handler so `cached()` can wrap
|
|
* the per-user compliance aggregation. Pure function over the user's
|
|
* intake events + the requested window; deterministic given a fixed
|
|
* "now" wall-clock (we anchor on `Date.now()` once at call time so a
|
|
* 15-minute cached row stays internally consistent).
|
|
*/
|
|
async function buildComplianceBuckets(
|
|
userId: string,
|
|
days: number,
|
|
userTz: string,
|
|
): Promise<ComplianceBucket[]> {
|
|
const nowMs = Date.now();
|
|
const start = new Date(nowMs - days * 86_400_000);
|
|
const events = await prisma.medicationIntakeEvent.findMany({
|
|
where: { userId, scheduledFor: { gte: start } },
|
|
select: { scheduledFor: true, takenAt: true, skipped: true },
|
|
});
|
|
|
|
const buckets = new Map<string, { scheduled: number; taken: number }>();
|
|
for (let i = 0; i < days; i++) {
|
|
const d = new Date(nowMs - i * 86_400_000);
|
|
buckets.set(userDayKey(d, userTz), { scheduled: 0, taken: 0 });
|
|
}
|
|
for (const e of events) {
|
|
const key = userDayKey(e.scheduledFor, userTz);
|
|
const bucket = buckets.get(key);
|
|
if (!bucket) continue;
|
|
bucket.scheduled += 1;
|
|
if (e.takenAt && !e.skipped) bucket.taken += 1;
|
|
}
|
|
|
|
return [...buckets.entries()]
|
|
.map(([date, v]) => ({ date, scheduled: v.scheduled, taken: v.taken }))
|
|
.sort((a, b) => a.date.localeCompare(b.date));
|
|
}
|
|
|
|
export const POST = apiHandler(async (request: NextRequest) => {
|
|
const { user } = await requireAuth();
|
|
|
|
const { data: body, error } = await safeJson(request);
|
|
if (error) return error;
|
|
|
|
const parsed = updateSchema.safeParse(body);
|
|
if (!parsed.success) {
|
|
return apiError(parsed.error.issues[0].message, 422);
|
|
}
|
|
|
|
const { intakeId, status, takenAt, snoozedUntil } = parsed.data;
|
|
|
|
const existing = await prisma.medicationIntakeEvent.findUnique({
|
|
where: { id: intakeId },
|
|
});
|
|
if (!existing || existing.userId !== user.id) {
|
|
return apiError("Intake event not found", 404);
|
|
}
|
|
|
|
const userTzForHook = user.timezone ?? DEFAULT_TIMEZONE;
|
|
|
|
let updated;
|
|
if (status === "taken") {
|
|
[updated] = await prisma.$transaction([
|
|
prisma.medicationIntakeEvent.update({
|
|
where: { id: intakeId },
|
|
data: { takenAt: takenAt ?? new Date(), skipped: false },
|
|
}),
|
|
prisma.medication.update({
|
|
where: { id: existing.medicationId },
|
|
data: { snoozedUntil: null },
|
|
}),
|
|
]);
|
|
} else if (status === "skipped") {
|
|
updated = await prisma.medicationIntakeEvent.update({
|
|
where: { id: intakeId },
|
|
data: { takenAt: null, skipped: true },
|
|
});
|
|
} else {
|
|
// snoozed: snoozedUntil lives on the Medication row.
|
|
const until = snoozedUntil ?? new Date(Date.now() + 30 * 60_000); // default +30min
|
|
await prisma.medication.update({
|
|
where: { id: existing.medicationId },
|
|
data: { snoozedUntil: until },
|
|
});
|
|
updated = await prisma.medicationIntakeEvent.findUnique({
|
|
where: { id: intakeId },
|
|
});
|
|
}
|
|
|
|
await auditLog("medications.intake.update", {
|
|
userId: user.id,
|
|
ipAddress: getClientIp(request),
|
|
details: { intakeId, status },
|
|
});
|
|
|
|
annotate({
|
|
action: { name: "medications.intake.update" },
|
|
meta: { intakeId, status },
|
|
});
|
|
|
|
// v1.4.34 IW-G — bust the medications + compliance + achievement
|
|
// caches for this user so the next read reflects the dose change.
|
|
invalidateUserMedications(user.id);
|
|
|
|
// v1.4.39 W-MED — refresh the persistent compliance rollup row for
|
|
// the affected day so the next read after the cache miss returns
|
|
// the up-to-date `(scheduled, taken, skipped)` tuple. Best-effort:
|
|
// a populator failure annotates ops without blocking the response.
|
|
await recomputeMedicationComplianceForEvent({
|
|
userId: user.id,
|
|
medicationId: existing.medicationId,
|
|
scheduledFor: existing.scheduledFor,
|
|
tz: userTzForHook,
|
|
});
|
|
|
|
return apiSuccess(updated);
|
|
});
|