mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-17 07:42:23 +00:00
feat(lint): refuse UTC day keys outside the time zone module
`instant.toISOString().slice(0, 10)` and parsing a key back as UTC midnight are the idioms behind every day-boundary fix this year: the evening west of UTC and the small hours east of it land on the neighbouring day. A new rule, healthlog/no-utc-day-key, refuses them in src/ outside src/lib/tz and tests, and refuses a disable directive for itself that is not next-line or gives no reason. The time zone module now names every legitimate form: userDayKey for a person's day, dateOnlyKey / dateOnlyAtNoonUtc / dayKeyAsUtcMidnight for date-only values and day labels, daysBetweenDateKeys / weekdayOfDateKey / isCalendarDateKey / statedDateKey for key arithmetic and parsing. Of the 133 sites the rule found, 84 are gone. Most moved onto a named helper with no change in behaviour; these changed behaviour: - cycle calendar, insights, Coach snapshot and prediction refresh start their lookbacks at the first instant of the user's day - a model-transcribed date like "June 10, 2026" no longer lands a day early in a process east of UTC (documents and lab scans) - a custom report range covers exactly the picked days in the profile zone instead of starting the evening before west of UTC - date-of-birth pickers cap at the user's today, not the UTC one - an allergy onset date is stored at noon UTC like other date-only values - the report's cycle summary, the Coach's usual BP range and the intake projector's rollup recompute use the user's day - vaccination dates render as dates instead of the previous evening 49 remain, each with its reason on the line above: 39 UTC by design (15 file name stamps, rollup and object keys, the UTC-day score engines) and 10 marked baseline. A guard test requires a classified reason on every directive and holds the baseline to a ceiling that only goes down.
This commit is contained in:
1 parent
5820078008
commit
7c5ff89def
105 files changed
+807
-200
No files matched your search
@@ -235,6 +235,7 @@ export async function readDailySpend(
|
||||
* the local meter to the same boundary keeps reasoning trivial.
|
||||
*/
|
||||
export function buildDateKey(at: Date = new Date()): string {
|
||||
// eslint-disable-next-line healthlog/no-utc-day-key -- UTC by design: the spend meter follows the provider's UTC billing day (see the doc comment)
|
||||
return at.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@ import { addDays } from "@/lib/cycle/day-math";
|
||||
import { readSourceDayAggregates } from "@/lib/measurements/day-aggregates";
|
||||
import { moodDateKey } from "@/lib/mood/date-key";
|
||||
import { DEFAULT_TIMEZONE } from "@/lib/tz/format";
|
||||
import { startOfLocalDayKey } from "@/lib/tz/local-day";
|
||||
|
||||
/** Trailing window the phase contrast walks (days). Mirrors the read route. */
|
||||
const WINDOW_DAYS = 365;
|
||||
@@ -191,7 +192,7 @@ export async function buildCycleSnapshotBlock(
|
||||
deletedAt: null,
|
||||
type: "WRIST_TEMPERATURE",
|
||||
measuredAt: {
|
||||
gte: new Date(Date.parse(`${addDays(today, -90)}T00:00:00Z`)),
|
||||
gte: startOfLocalDayKey(addDays(today, -90), tz),
|
||||
},
|
||||
},
|
||||
orderBy: { measuredAt: "asc" },
|
||||
@@ -206,7 +207,7 @@ export async function buildCycleSnapshotBlock(
|
||||
readSourceDayAggregates({
|
||||
userId,
|
||||
types: PHASE_CROSSTAB_METRIC_TYPES,
|
||||
since: new Date(Date.parse(`${from}T00:00:00Z`)),
|
||||
since: startOfLocalDayKey(from, tz),
|
||||
timeZone: tz,
|
||||
}),
|
||||
prisma.user.findUnique({
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
*/
|
||||
import type { Locale } from "@/lib/i18n/config";
|
||||
import { resolveUserTimezone } from "@/lib/tz/resolver";
|
||||
import { userDayKey } from "@/lib/tz/format";
|
||||
import { userDayKey, shiftDateKey } from "@/lib/tz/format";
|
||||
import { annotate } from "@/lib/logging/context";
|
||||
import type {
|
||||
CoachFollowUp,
|
||||
@@ -93,9 +93,7 @@ export function followUpChipsEnabled(prefs: CoachPrefs): boolean {
|
||||
|
||||
/** `YYYY-MM-DD` minus `days`, as a day key. */
|
||||
function dayKeyMinus(dayKey: string, days: number): string {
|
||||
const at = new Date(`${dayKey}T00:00:00Z`);
|
||||
at.setUTCDate(at.getUTCDate() - days);
|
||||
return at.toISOString().slice(0, 10);
|
||||
return shiftDateKey(dayKey, -days);
|
||||
}
|
||||
|
||||
/** True when the record's first reading lies before `dayKey`. */
|
||||
|
||||
@@ -25,7 +25,13 @@ import { matchGlp1SideEffectTags } from "@/lib/medications/glp1-side-effect-tag-
|
||||
import type { Glp1SideEffectTag } from "@/lib/medications/glp1-side-effect-tags";
|
||||
import { isRecordOnly } from "@/lib/medications/intake-tracking";
|
||||
import { floorWhole } from "@/lib/medications/units-per-dose";
|
||||
import { DEFAULT_TIMEZONE, shiftDateKey, userDayKey } from "@/lib/tz/format";
|
||||
import {
|
||||
DEFAULT_TIMEZONE,
|
||||
daysBetweenDateKeys,
|
||||
shiftDateKey,
|
||||
userDayKey,
|
||||
weekdayOfDateKey,
|
||||
} from "@/lib/tz/format";
|
||||
|
||||
/**
|
||||
* Recommended generic name for the canonical GLP-1 drug brand. The Coach
|
||||
@@ -160,11 +166,6 @@ function weeksBetween(from: Date, to: Date): number {
|
||||
return Math.max(0, Math.round(ms / (7 * 24 * 60 * 60 * 1000)));
|
||||
}
|
||||
|
||||
/** Midnight UTC of a calendar-day key: a label for day arithmetic only. */
|
||||
function keyEpochDays(key: string): number {
|
||||
return Math.round(Date.parse(`${key}T00:00:00.000Z`) / 86_400_000);
|
||||
}
|
||||
|
||||
/**
|
||||
* Predict next injection from cadence + last intake.
|
||||
*
|
||||
@@ -191,17 +192,12 @@ function predictNextInjection(
|
||||
if (schedule.cadence === "weekly" && schedule.daysOfWeek.length > 0) {
|
||||
const targetDow = schedule.daysOfWeek[0];
|
||||
// Project forward from the anchor (lastInjection if known, otherwise
|
||||
// today) until we land on the target weekday. The weekday of a
|
||||
// calendar date does not depend on any zone, so the key's UTC label
|
||||
// answers it.
|
||||
// today) until we land on the target weekday.
|
||||
const anchorKey = lastInjection ? lastInjection.date : todayKey;
|
||||
for (let i = 1; i <= 14; i += 1) {
|
||||
const key = shiftDateKey(anchorKey, i);
|
||||
if (new Date(`${key}T00:00:00.000Z`).getUTCDay() === targetDow) {
|
||||
const daysAway = Math.max(
|
||||
0,
|
||||
keyEpochDays(key) - keyEpochDays(todayKey),
|
||||
);
|
||||
if (weekdayOfDateKey(key) === targetDow) {
|
||||
const daysAway = Math.max(0, daysBetweenDateKeys(todayKey, key));
|
||||
return { date: key, daysAway };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ import { prisma } from "@/lib/db";
|
||||
import type { MeasurementType } from "@/generated/prisma/client";
|
||||
import type { Locale } from "@/lib/i18n/config";
|
||||
import { getServerTranslator } from "@/lib/i18n/server-translator";
|
||||
import { shiftDateKey, userDayKey } from "@/lib/tz/format";
|
||||
import { shiftDateKey, userDayKey, weekdayOfDateKey } from "@/lib/tz/format";
|
||||
import { startOfLocalDayKey } from "@/lib/tz/local-day";
|
||||
import {
|
||||
readDailySeries,
|
||||
@@ -66,6 +66,7 @@ import type {
|
||||
|
||||
import { aggregationKind } from "./chart-spec";
|
||||
import { RESULT_TABLE_MAX_ROWS } from "./project";
|
||||
import { dateOnlyKey } from "@/lib/tz/date-only";
|
||||
|
||||
/**
|
||||
* Sources the table tool leaves to their own tools: glucose needs its
|
||||
@@ -167,16 +168,14 @@ export function resolveTableRange(args: {
|
||||
|
||||
// ── Period keys ─────────────────────────────────────────────────────────
|
||||
|
||||
/** `YYYY-MM-DD` of a UTC-midnight bucket timestamp. */
|
||||
/** `YYYY-MM-DD` of a UTC-midnight bucket timestamp (a day label). */
|
||||
function dayKeyOfUtc(ms: number): string {
|
||||
return new Date(ms).toISOString().slice(0, 10);
|
||||
return dateOnlyKey(new Date(ms));
|
||||
}
|
||||
|
||||
/** Monday (`YYYY-MM-DD`) of the ISO week `dayKey` falls in. */
|
||||
function weekKeyOf(dayKey: string): string {
|
||||
const ms = Date.parse(`${dayKey}T00:00:00Z`);
|
||||
const dow = (new Date(ms).getUTCDay() + 6) % 7;
|
||||
return dayKeyOfUtc(ms - dow * 86_400_000);
|
||||
return shiftDateKey(dayKey, -((weekdayOfDateKey(dayKey) + 6) % 7));
|
||||
}
|
||||
|
||||
function monthKeyOf(dayKey: string): string {
|
||||
@@ -416,8 +415,12 @@ async function readMeasurementDays(args: {
|
||||
return { series: ordered, counts, suffixes };
|
||||
}
|
||||
|
||||
/** `YYYY-MM-DD` of an instant in UTC. */
|
||||
/**
|
||||
* `YYYY-MM-DD` of an instant in UTC. Only for the all-time month read: the
|
||||
* MONTH rollup tier buckets UTC months, so its range edges are UTC days.
|
||||
*/
|
||||
function utcDayKey(date: Date): string {
|
||||
// eslint-disable-next-line healthlog/no-utc-day-key -- UTC by design: the MONTH rollup tier buckets UTC months, so this read keys its edges on UTC days
|
||||
return date.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
*/
|
||||
import type { Locale } from "@/lib/i18n/config";
|
||||
import { getServerTranslator } from "@/lib/i18n/server-translator";
|
||||
import { shiftDateKey, userDayKey } from "@/lib/tz/format";
|
||||
import { shiftDateKey, userDayKey, weekdayOfDateKey } from "@/lib/tz/format";
|
||||
import type {
|
||||
CoachResultCell,
|
||||
CoachResultTable,
|
||||
@@ -189,17 +189,13 @@ function mondayOfIsoWeek(weekIso: string): string | null {
|
||||
const year = Number(match[1]);
|
||||
const week = Number(match[2]);
|
||||
// Week 1 holds January 4th; its Monday is the ISO year's first Monday.
|
||||
const jan4 = Date.UTC(year, 0, 4);
|
||||
const jan4Dow = (new Date(jan4).getUTCDay() + 6) % 7;
|
||||
const monday = jan4 - jan4Dow * 86_400_000 + (week - 1) * 7 * 86_400_000;
|
||||
return new Date(monday).toISOString().slice(0, 10);
|
||||
const jan4 = `${String(year).padStart(4, "0")}-01-04`;
|
||||
return shiftDateKey(mondayOfDay(jan4), (week - 1) * 7);
|
||||
}
|
||||
|
||||
/** Monday (`YYYY-MM-DD`) of the ISO week a day key falls in. */
|
||||
function mondayOfDay(dayKey: string): string {
|
||||
const ms = Date.parse(`${dayKey}T00:00:00Z`);
|
||||
const dow = (new Date(ms).getUTCDay() + 6) % 7;
|
||||
return shiftDateKey(new Date(ms).toISOString().slice(0, 10), -dow);
|
||||
return shiftDateKey(dayKey, -((weekdayOfDateKey(dayKey) + 6) % 7));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -59,8 +59,8 @@ export function buildCoreMetricsBlocks(
|
||||
);
|
||||
const olderSys = sysRows.filter((row) => row.measuredAt < ctx.recentCutoff);
|
||||
const olderDia = diaRows.filter((row) => row.measuredAt < ctx.recentCutoff);
|
||||
const sysBand = bpBandFromRows(sysRows, "BLOOD_PRESSURE_SYS");
|
||||
const diaBand = bpBandFromRows(diaRows, "BLOOD_PRESSURE_DIA");
|
||||
const sysBand = bpBandFromRows(sysRows, "BLOOD_PRESSURE_SYS", ctx.userTz);
|
||||
const diaBand = bpBandFromRows(diaRows, "BLOOD_PRESSURE_DIA", ctx.userTz);
|
||||
const usualRange =
|
||||
sysBand || diaBand
|
||||
? {
|
||||
|
||||
@@ -297,10 +297,12 @@ export function buildDailyBpRows(
|
||||
export function bpBandFromRows(
|
||||
rows: ReadonlyArray<{ measuredAt: Date; value: number }>,
|
||||
type: "BLOOD_PRESSURE_SYS" | "BLOOD_PRESSURE_DIA",
|
||||
tz: string,
|
||||
): { low: number; high: number } | null {
|
||||
const byDay = new Map<string, { sum: number; count: number }>();
|
||||
for (const r of rows) {
|
||||
const day = r.measuredAt.toISOString().slice(0, 10);
|
||||
// The user's day, like every other day mean in the snapshot.
|
||||
const day = tzDayKey(r.measuredAt, tz);
|
||||
const acc = byDay.get(day) ?? { sum: 0, count: 0 };
|
||||
acc.sum += r.value;
|
||||
acc.count += 1;
|
||||
|
||||
Reference in new issue
Block a user