mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 07:13:29 +00:00
feat(nutrients): source-aware day totals; manual water write path
NutrientIntakeDay's composite primary key gains `source` (migration 0249_nutrient_intake_day_source): a manual water entry and the Apple-synced day total now live as two rows instead of the manual write being silently clobbered by the next Apple last-writer-wins sync. Every existing row already defaults to source=APPLE_HEALTH, so the migration is a pure PK-constraint change with no data rewrite. - POST /api/nutrients/batch keeps writing the APPLE_HEALTH row, byte-identical upsert semantics against the wider key. - GET /api/nutrients sums amounts within (nutrient, day) across sources before folding into the window summary. - POST /api/nutrients/water (new): manual water quick-add, add/set modes against the MANUAL row only, module-gated, rate-limited, idempotency-key aware, hard-evicts the dashboard snapshot cache. - GET /api/nutrients/daily (new): dense per-day series for one nutrient (summed across sources) plus the EFSA reference resolved against the caller's profile sex — omitted when sex is unknown. - catalog.ts gains resolveNutrientReference(), the sex-resolution helper both new routes and the insights cards share. docs/api/openapi.yaml regenerated for the two new routes.
This commit is contained in:
1 parent
bef3b9dd3f
commit
da2de015fe
15 files changed
+1075
-11
No files matched your search
@@ -0,0 +1,19 @@
|
||||
-- v1.29 — `source` joins the `nutrient_intake_days` primary key so a
|
||||
-- manual water entry and the Apple-synced day total coexist as two rows
|
||||
-- instead of the manual write being silently clobbered by the next
|
||||
-- Apple last-writer-wins sync (the batch route always upserts the
|
||||
-- (userId, day, nutrient) row with the CURRENT running total, so a
|
||||
-- manual increment folded into that same row would vanish on the next
|
||||
-- sync — a data-loss bug by construction, not a rare race).
|
||||
--
|
||||
-- No data rewrite: every existing row already carries
|
||||
-- `source = 'APPLE_HEALTH'` (the column default since migration 0241),
|
||||
-- so dropping and recreating the PRIMARY KEY over the four columns is a
|
||||
-- pure constraint change — same rows, same values, wider key. The
|
||||
-- existing `(user_id, nutrient, day DESC)` index is untouched; it does
|
||||
-- not reference `source` and continues to serve the window-scan reads.
|
||||
ALTER TABLE "nutrient_intake_days" DROP CONSTRAINT "nutrient_intake_days_pkey";
|
||||
|
||||
ALTER TABLE "nutrient_intake_days"
|
||||
ADD CONSTRAINT "nutrient_intake_days_pkey"
|
||||
PRIMARY KEY ("user_id", "day", "nutrient", "source");
|
||||
@@ -6349,13 +6349,20 @@ model NutrientIntakeDay {
|
||||
/// denormalised on purpose: rows stay self-describing in exports
|
||||
/// even if the catalog ever drifts.
|
||||
unit String
|
||||
/// "APPLE_HEALTH" | "MANUAL" (closed set enforced in app code, not a
|
||||
/// DB enum). v1.29 — joined the composite PK (migration 0249) so a
|
||||
/// manual water entry and the Apple-synced day total coexist as two
|
||||
/// rows instead of the manual write being silently clobbered by the
|
||||
/// next Apple last-writer-wins sync. Apple owns its row (LWW on
|
||||
/// re-post); manual owns its row (increment/set via
|
||||
/// `POST /api/nutrients/water`); reads SUM across sources per day.
|
||||
source String @default("APPLE_HEALTH")
|
||||
externalSourceVersion String? @map("external_source_version")
|
||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz(3)
|
||||
updatedAt DateTime @updatedAt @map("updated_at") @db.Timestamptz(3)
|
||||
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
||||
|
||||
@@id([userId, day, nutrient])
|
||||
@@id([userId, day, nutrient, source])
|
||||
@@index([userId, nutrient, day(sort: Desc)])
|
||||
@@map("nutrient_intake_days")
|
||||
}
|
||||
Reference in new issue
Block a user