mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-13 14:32:03 +00:00
The v1.4.35/v1.4.36 read-swap gated on a global `COUNT(*) > 0`
against `measurement_rollups`. A user with BP fully rolled up who
logged their first WEIGHT measurement saw the per-write hook upsert
one WEIGHT DAY bucket, the global probe flipped to true, the read
path picked the bucket-derived branch for WEIGHT, and the all-time
WEIGHT count collapsed to whatever the trailing 90d narrow aggregate
plus the single fresh bucket could reconstruct.
The new shared probe in `rollup-coverage.ts` joins distinct
measurement types against the rollup table per user and surfaces
`{ type, has_buckets }` rows. Both `computeSummariesSlice` and
`buildComprehensiveAggregate` take the rollup-derived branch only
when every type the user has logged is covered; partial coverage
falls back to the live aggregate so the brand-new-type case stays
correct. Integration test seeds BP rolled up + WEIGHT raw-only and
asserts the WEIGHT summary count matches live SQL.
537 lines
19 KiB
TypeScript
537 lines
19 KiB
TypeScript
/**
|
|
* v1.4.36 — slim `summaries` slice for `/api/analytics?slice=summaries`.
|
|
*
|
|
* The default `/api/analytics` path fans out 30+ `Promise.all`-wrapped
|
|
* chunked findMany reads (one per `MeasurementType`) so it can hand
|
|
* each series to `summarize()` for slope7/30/90 + anomaly detection +
|
|
* lastMonth/lastYear means. The dashboard tile strip only consumes
|
|
* `count`, `latest`, `avg7`, `avg30`, `min`, `max`, `mean`, and the
|
|
* three slope tuples — every other field gets `null`-coalesced before
|
|
* it ever paints — yet the user waits on the full chunked walk.
|
|
*
|
|
* Read shape (v1.4.36)
|
|
* --------------------
|
|
* v1.4.35 partially read-swapped onto the persistent `measurement_rollups`
|
|
* table but kept the full-fat `$queryRaw` running in parallel as a
|
|
* parity check. The heavy COUNT/MIN/MAX/AVG aggregate scanned the
|
|
* measurements table every request even on warm rollups.
|
|
*
|
|
* v1.4.36 promotes the rollup table to the canonical source on the
|
|
* happy path: a single cheap COUNT against `measurement_rollups`
|
|
* decides whether to read the composable stats from buckets or fall
|
|
* back to the heavy live aggregate. When the rollup is populated:
|
|
*
|
|
* 1. **DAY-bucket read** — composes `count / min / max / mean` per
|
|
* type via `aggregateBuckets`. The four are linearly composable
|
|
* across DAY buckets so the composed value is mathematically
|
|
* identical to the live aggregate over the same rows.
|
|
*
|
|
* 2. **Narrow `$queryRaw`** — carries only the non-composable
|
|
* windowed columns (`avg7`, `avg30`, and the slope tuples). The
|
|
* heavy COUNT/MIN/MAX/AVG columns are NOT projected.
|
|
*
|
|
* 3. **`DISTINCT ON (type)` latest read** — most-recent `(type,
|
|
* value, measured_at)` triplet per type for the `latest` field
|
|
* and the `lastSeenByType` freshness map.
|
|
*
|
|
* On the cold fallback (no rollup rows yet) the slim slice runs the
|
|
* legacy heavy aggregate so the response shape is correct on the very
|
|
* first request.
|
|
*
|
|
* Fields the slim shape intentionally omits (the dashboard never
|
|
* reads them on first paint):
|
|
* - `anomalyCount`: would require an extra per-type read for the
|
|
* z-score loop. The Coach / insights paths still get it via the
|
|
* default slice.
|
|
* - `avg30LastMonth` / `avg30LastYear`: the dashboard tile delta
|
|
* callout uses them, but only when the comparison-baseline
|
|
* widget is enabled — that path already pre-fetches the default
|
|
* slice via the explicit comparison opt-in.
|
|
*
|
|
* Slope `confidence` is the SQL `regr_r2` value (R²) which matches
|
|
* the existing `trendSlope()` helper's `Math.round(rSquared * 100) /
|
|
* 100`. Slope `direction` is derived from `slope`'s sign with the
|
|
* same 0.01-units-per-day "stable" threshold the JS helper uses.
|
|
*/
|
|
import { prisma } from "@/lib/db";
|
|
import type { DataSummary } from "@/lib/analytics/trends";
|
|
import { measurementTypeEnum } from "@/lib/validations/measurement";
|
|
import { annotate } from "@/lib/logging/context";
|
|
import { ensureUserRollupsFresh } from "@/lib/measurements/rollups";
|
|
import { aggregateBuckets } from "@/lib/measurements/rollup-read";
|
|
import {
|
|
isFullyCovered,
|
|
probeRollupCoverage,
|
|
} from "@/lib/measurements/rollup-coverage";
|
|
|
|
/**
|
|
* Heavy aggregate row — used on the cold-mount fallback path where the
|
|
* rollup table is empty and we need every per-type column out of one
|
|
* SQL pass for the very first request.
|
|
*/
|
|
interface HeavyAggregateRow {
|
|
type: string;
|
|
count: bigint;
|
|
min_value: number | null;
|
|
max_value: number | null;
|
|
mean_value: number | null;
|
|
avg7: number | null;
|
|
avg30: number | null;
|
|
slope7: number | null;
|
|
r2_7: number | null;
|
|
slope30: number | null;
|
|
r2_30: number | null;
|
|
slope90: number | null;
|
|
r2_90: number | null;
|
|
}
|
|
|
|
/**
|
|
* Narrow aggregate row — only the columns DAY buckets can't compose
|
|
* linearly. The heavy `COUNT / MIN / MAX / AVG` columns are dropped
|
|
* so the rollup-fresh read path's SQL projection is half as wide as
|
|
* the legacy aggregate's.
|
|
*/
|
|
interface NarrowAggregateRow {
|
|
type: string;
|
|
avg7: number | null;
|
|
avg30: number | null;
|
|
slope7: number | null;
|
|
r2_7: number | null;
|
|
slope30: number | null;
|
|
r2_30: number | null;
|
|
slope90: number | null;
|
|
r2_90: number | null;
|
|
}
|
|
|
|
interface LatestRow {
|
|
type: string;
|
|
value: number;
|
|
/**
|
|
* v1.4.34 IW-B — per-type freshness timestamp. The DISTINCT ON pass
|
|
* already orders by `measured_at DESC` to pick the latest row's
|
|
* value; surfacing `measured_at` from the same row costs zero extra
|
|
* round-trips and feeds the dashboard tile-strip's stale-data
|
|
* caption (driven via `<TrendCard staleDays>`).
|
|
*/
|
|
measured_at: Date;
|
|
}
|
|
|
|
/** Same threshold/rounding contract as `trendSlope()` in `trends.ts`. */
|
|
function buildSlope(
|
|
slope: number | null,
|
|
rSquared: number | null,
|
|
): DataSummary["slope7"] {
|
|
if (slope === null) return null;
|
|
const threshold = 0.01;
|
|
const direction: "up" | "down" | "stable" =
|
|
Math.abs(slope) < threshold ? "stable" : slope > 0 ? "up" : "down";
|
|
return {
|
|
slope: Math.round(slope * 1000) / 1000,
|
|
direction,
|
|
confidence: rSquared === null ? 0 : Math.round(rSquared * 100) / 100,
|
|
};
|
|
}
|
|
|
|
function round2(value: number | null): number | null {
|
|
if (value === null || !Number.isFinite(value)) return null;
|
|
return Math.round(value * 100) / 100;
|
|
}
|
|
|
|
function emptySummary(): DataSummary {
|
|
return {
|
|
count: 0,
|
|
latest: null,
|
|
min: null,
|
|
max: null,
|
|
mean: null,
|
|
avg7: null,
|
|
avg30: null,
|
|
slope7: null,
|
|
slope30: null,
|
|
slope90: null,
|
|
anomalyCount: 0,
|
|
avg30LastMonth: null,
|
|
avg30LastYear: null,
|
|
};
|
|
}
|
|
|
|
export interface SummariesSlice {
|
|
summaries: Record<string, DataSummary>;
|
|
/**
|
|
* `null` on the slim slice. The default route computes BMI from
|
|
* `summaries.WEIGHT.latest` + `user.heightCm`; consumers of the
|
|
* slim slice that need BMI re-derive client-side or fetch the
|
|
* default slice.
|
|
*/
|
|
bmi: null;
|
|
/**
|
|
* v1.4.34 IW-B — per-type freshness map matching the default-slice
|
|
* shape so the dashboard tile strip can render a "Letzter Wert vor
|
|
* Xd" caption on stale tiles regardless of which slice the client
|
|
* read from. Types the user has never logged report `null`.
|
|
*/
|
|
lastSeenByType: Record<
|
|
string,
|
|
{ lastSeenAt: string; daysAgo: number } | null
|
|
>;
|
|
}
|
|
|
|
export async function computeSummariesSlice(
|
|
userId: string,
|
|
): Promise<SummariesSlice> {
|
|
// Keep the persistent rollup table current before the bucket read
|
|
// fires. On a warm process this is a single watermark query; on a
|
|
// cold mount it folds the trailing 90-day window into the DAY
|
|
// rollup so the bucket read below has something to compose.
|
|
await ensureUserRollupsFresh(userId);
|
|
|
|
// v1.4.36 QA C1 — per-type coverage probe replaces the legacy global
|
|
// COUNT. The previous gate returned true as soon as ANY type had at
|
|
// least one DAY bucket. Pathology: a user with BP fully rolled up
|
|
// logs their first WEIGHT measurement → the sync write-hook upserts
|
|
// one WEIGHT DAY bucket → the global probe stayed >0 → the route
|
|
// flipped to the bucket-derived path for WEIGHT as well → all-time
|
|
// count collapsed to whatever the trailing window covers because the
|
|
// narrow aggregate's windowed columns + the single fresh bucket
|
|
// can't reconstruct the prior history. We now decide per type and
|
|
// only take the rollup path when EVERY type the user has logged is
|
|
// covered. Partial coverage falls back to the live aggregate so the
|
|
// brand-new-type case stays correct.
|
|
const coverage = await probeRollupCoverage(userId);
|
|
if (isFullyCovered(coverage)) {
|
|
return computeFromRollups(userId);
|
|
}
|
|
return computeFromLiveAggregate(userId);
|
|
}
|
|
|
|
/**
|
|
* Happy path — DAY buckets carry `count / min / max / mean`; a narrow
|
|
* `$queryRaw` carries only the windowed avgs + regression columns the
|
|
* buckets cannot reconstruct.
|
|
*/
|
|
async function computeFromRollups(userId: string): Promise<SummariesSlice> {
|
|
const [narrows, latests, dayBuckets] = await Promise.all([
|
|
prisma.$queryRaw<NarrowAggregateRow[]>`
|
|
SELECT
|
|
m."type"::text AS type,
|
|
AVG(m."value") FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '7 days'
|
|
)::double precision AS avg7,
|
|
AVG(m."value") FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '30 days'
|
|
)::double precision AS avg30,
|
|
REGR_SLOPE(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '7 days'
|
|
)::double precision AS slope7,
|
|
REGR_R2(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '7 days'
|
|
)::double precision AS r2_7,
|
|
REGR_SLOPE(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '30 days'
|
|
)::double precision AS slope30,
|
|
REGR_R2(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '30 days'
|
|
)::double precision AS r2_30,
|
|
REGR_SLOPE(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '90 days'
|
|
)::double precision AS slope90,
|
|
REGR_R2(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '90 days'
|
|
)::double precision AS r2_90
|
|
FROM measurements m
|
|
WHERE m."user_id" = ${userId}
|
|
GROUP BY m."type"
|
|
`,
|
|
prisma.$queryRaw<LatestRow[]>`
|
|
SELECT DISTINCT ON (m."type")
|
|
m."type"::text AS type,
|
|
m."value"::double precision AS value,
|
|
m."measured_at" AS measured_at
|
|
FROM measurements m
|
|
WHERE m."user_id" = ${userId}
|
|
ORDER BY m."type", m."measured_at" DESC
|
|
`,
|
|
// v1.4.35 — every DAY rollup bucket for the user. The slim slice's
|
|
// `count / min / max / mean` is all-time, so we read the bucket
|
|
// table without a `bucketStart` window. The defensive parity
|
|
// check below uses the live aggregate's `COUNT(*)` to decide
|
|
// whether the rollup is complete for this account (post-backfill
|
|
// → composed) or partial (pre-backfill → falls back to live).
|
|
prisma.measurementRollup.findMany({
|
|
where: { userId, granularity: "DAY" },
|
|
orderBy: [{ type: "asc" }, { bucketStart: "asc" }],
|
|
select: {
|
|
type: true,
|
|
bucketStart: true,
|
|
count: true,
|
|
mean: true,
|
|
minValue: true,
|
|
maxValue: true,
|
|
},
|
|
}),
|
|
]);
|
|
|
|
const latestByType = new Map<string, number>();
|
|
// v1.4.34 IW-B — capture the per-type `measured_at` alongside the
|
|
// value so we can surface the freshness map on the slim slice
|
|
// without an extra round-trip.
|
|
const lastSeenAtByType = new Map<string, Date>();
|
|
for (const row of latests) {
|
|
latestByType.set(row.type, Number(row.value));
|
|
if (row.measured_at) {
|
|
lastSeenAtByType.set(row.type, new Date(row.measured_at));
|
|
}
|
|
}
|
|
|
|
// Seed every enum option so consumers can read `summaries.PULSE` and
|
|
// get a deterministic empty shape rather than `undefined`. Mirrors
|
|
// the default route which iterates `measurementTypeEnum.options`.
|
|
const summaries: Record<string, DataSummary> = {};
|
|
const lastSeenByType: Record<
|
|
string,
|
|
{ lastSeenAt: string; daysAgo: number } | null
|
|
> = {};
|
|
for (const type of measurementTypeEnum.options) {
|
|
summaries[type] = emptySummary();
|
|
lastSeenByType[type] = null;
|
|
}
|
|
|
|
const nowForStaleness = Date.now();
|
|
for (const [type, measuredAt] of lastSeenAtByType.entries()) {
|
|
const daysAgo = Math.floor(
|
|
(nowForStaleness - measuredAt.getTime()) / (24 * 60 * 60 * 1000),
|
|
);
|
|
lastSeenByType[type] = {
|
|
lastSeenAt: measuredAt.toISOString(),
|
|
daysAgo,
|
|
};
|
|
}
|
|
|
|
// v1.4.35 — partition the DAY buckets by type so the per-type loop
|
|
// can compose `count / min / max / mean` from them in O(1).
|
|
const bucketsByType = new Map<
|
|
string,
|
|
Array<{
|
|
day: Date;
|
|
count: number;
|
|
mean: number;
|
|
minValue: number;
|
|
maxValue: number;
|
|
}>
|
|
>();
|
|
for (const b of dayBuckets) {
|
|
const list = bucketsByType.get(b.type) ?? [];
|
|
list.push({
|
|
day: b.bucketStart,
|
|
count: b.count,
|
|
mean: b.mean,
|
|
minValue: b.minValue,
|
|
maxValue: b.maxValue,
|
|
});
|
|
bucketsByType.set(b.type, list);
|
|
}
|
|
|
|
const narrowByType = new Map<string, NarrowAggregateRow>();
|
|
for (const row of narrows) {
|
|
narrowByType.set(row.type, row);
|
|
}
|
|
|
|
let totalRows = 0;
|
|
for (const [type, buckets] of bucketsByType.entries()) {
|
|
const composed = aggregateBuckets(buckets);
|
|
if (composed.count === 0) continue;
|
|
totalRows += composed.count;
|
|
const narrow = narrowByType.get(type);
|
|
const latest = latestByType.get(type) ?? null;
|
|
summaries[type] = {
|
|
count: composed.count,
|
|
latest,
|
|
min: round2(composed.min),
|
|
max: round2(composed.max),
|
|
mean: round2(composed.mean),
|
|
avg7: round2(narrow?.avg7 ?? null),
|
|
avg30: round2(narrow?.avg30 ?? null),
|
|
slope7: buildSlope(narrow?.slope7 ?? null, narrow?.r2_7 ?? null),
|
|
slope30: buildSlope(narrow?.slope30 ?? null, narrow?.r2_30 ?? null),
|
|
slope90: buildSlope(narrow?.slope90 ?? null, narrow?.r2_90 ?? null),
|
|
anomalyCount: 0,
|
|
avg30LastMonth: null,
|
|
avg30LastYear: null,
|
|
};
|
|
}
|
|
|
|
annotate({
|
|
action: { name: "analytics.get.slim" },
|
|
meta: {
|
|
analytics: {
|
|
slim_summaries: {
|
|
row_count: totalRows,
|
|
type_count: bucketsByType.size,
|
|
path: "rollup",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
return { summaries, bmi: null, lastSeenByType };
|
|
}
|
|
|
|
/**
|
|
* Cold fallback — runs the legacy heavy aggregate when the rollup
|
|
* table is empty for this user. Subsequent reads pick up the populated
|
|
* rollup on `computeFromRollups`.
|
|
*/
|
|
async function computeFromLiveAggregate(
|
|
userId: string,
|
|
): Promise<SummariesSlice> {
|
|
const [aggregates, latests] = await Promise.all([
|
|
prisma.$queryRaw<HeavyAggregateRow[]>`
|
|
SELECT
|
|
m."type"::text AS type,
|
|
COUNT(*) AS count,
|
|
MIN(m."value")::double precision AS min_value,
|
|
MAX(m."value")::double precision AS max_value,
|
|
AVG(m."value")::double precision AS mean_value,
|
|
AVG(m."value") FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '7 days'
|
|
)::double precision AS avg7,
|
|
AVG(m."value") FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '30 days'
|
|
)::double precision AS avg30,
|
|
REGR_SLOPE(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '7 days'
|
|
)::double precision AS slope7,
|
|
REGR_R2(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '7 days'
|
|
)::double precision AS r2_7,
|
|
REGR_SLOPE(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '30 days'
|
|
)::double precision AS slope30,
|
|
REGR_R2(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '30 days'
|
|
)::double precision AS r2_30,
|
|
REGR_SLOPE(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '90 days'
|
|
)::double precision AS slope90,
|
|
REGR_R2(
|
|
m."value",
|
|
EXTRACT(EPOCH FROM m."measured_at") / 86400.0
|
|
) FILTER (
|
|
WHERE m."measured_at" >= NOW() - INTERVAL '90 days'
|
|
)::double precision AS r2_90
|
|
FROM measurements m
|
|
WHERE m."user_id" = ${userId}
|
|
GROUP BY m."type"
|
|
`,
|
|
prisma.$queryRaw<LatestRow[]>`
|
|
SELECT DISTINCT ON (m."type")
|
|
m."type"::text AS type,
|
|
m."value"::double precision AS value,
|
|
m."measured_at" AS measured_at
|
|
FROM measurements m
|
|
WHERE m."user_id" = ${userId}
|
|
ORDER BY m."type", m."measured_at" DESC
|
|
`,
|
|
]);
|
|
|
|
const latestByType = new Map<string, number>();
|
|
const lastSeenAtByType = new Map<string, Date>();
|
|
for (const row of latests) {
|
|
latestByType.set(row.type, Number(row.value));
|
|
if (row.measured_at) {
|
|
lastSeenAtByType.set(row.type, new Date(row.measured_at));
|
|
}
|
|
}
|
|
|
|
const summaries: Record<string, DataSummary> = {};
|
|
const lastSeenByType: Record<
|
|
string,
|
|
{ lastSeenAt: string; daysAgo: number } | null
|
|
> = {};
|
|
for (const type of measurementTypeEnum.options) {
|
|
summaries[type] = emptySummary();
|
|
lastSeenByType[type] = null;
|
|
}
|
|
|
|
const nowForStaleness = Date.now();
|
|
for (const [type, measuredAt] of lastSeenAtByType.entries()) {
|
|
const daysAgo = Math.floor(
|
|
(nowForStaleness - measuredAt.getTime()) / (24 * 60 * 60 * 1000),
|
|
);
|
|
lastSeenByType[type] = {
|
|
lastSeenAt: measuredAt.toISOString(),
|
|
daysAgo,
|
|
};
|
|
}
|
|
|
|
let totalRows = 0;
|
|
for (const row of aggregates) {
|
|
const count = Number(row.count);
|
|
totalRows += count;
|
|
const latest = latestByType.get(row.type) ?? null;
|
|
summaries[row.type] = {
|
|
count,
|
|
latest,
|
|
min: round2(row.min_value),
|
|
max: round2(row.max_value),
|
|
mean: round2(row.mean_value),
|
|
avg7: round2(row.avg7),
|
|
avg30: round2(row.avg30),
|
|
slope7: buildSlope(row.slope7, row.r2_7),
|
|
slope30: buildSlope(row.slope30, row.r2_30),
|
|
slope90: buildSlope(row.slope90, row.r2_90),
|
|
anomalyCount: 0,
|
|
avg30LastMonth: null,
|
|
avg30LastYear: null,
|
|
};
|
|
}
|
|
|
|
annotate({
|
|
action: { name: "analytics.get.slim" },
|
|
meta: {
|
|
analytics: {
|
|
slim_summaries: {
|
|
row_count: totalRows,
|
|
type_count: aggregates.length,
|
|
path: "live",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
return { summaries, bmi: null, lastSeenByType };
|
|
}
|