mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 23:33:29 +00:00
Merge branch 'main' into feat/encounter-phase-1
This commit is contained in:
commit
a83be074ca
65 files changed
+7864
-624
No files matched your search
@@ -24,6 +24,14 @@ import {
|
||||
} from "@/lib/mood/custom-tags";
|
||||
import { moodTagLayoutSchema } from "@/lib/mood/tag-layout";
|
||||
import { moodLevelEnum, moodSourceEnum } from "@/lib/validations/mood";
|
||||
import {
|
||||
CONTACT_CIRCLE_KEYS,
|
||||
CONTACT_EXTENT_KEYS,
|
||||
CONTACT_FORM_KEYS,
|
||||
EVENT_TYPE_KEYS,
|
||||
LEISURE_CATEGORY_KEYS,
|
||||
WORK_STATUS_KEYS,
|
||||
} from "@/lib/mood/context-vocabulary";
|
||||
import {
|
||||
dataEnvelope,
|
||||
errorEnvelope,
|
||||
@@ -188,6 +196,77 @@ const notFoundResponse = {
|
||||
},
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* v1.38 — the day's context on a mood entry, in the one shape both the write
|
||||
* path and the sync feed use.
|
||||
*
|
||||
* Every field optional and nullable. The two multi-selects are closed key
|
||||
* lists; a value outside them is refused rather than stored, which is what
|
||||
* keeps the analytics and the six locale label sets from drifting apart from
|
||||
* the data.
|
||||
*
|
||||
* Exported so `./sync.ts` publishes the same object rather than declaring a
|
||||
* second one — two definitions of one payload is how a client ends up decoding
|
||||
* a field the server stopped sending.
|
||||
*/
|
||||
export const moodContextWire = z
|
||||
.object({
|
||||
workStatus: z
|
||||
.enum(WORK_STATUS_KEYS)
|
||||
.nullish()
|
||||
.describe("Shape of the working day."),
|
||||
workMinutes: z.number().int().min(0).max(1440).nullish(),
|
||||
overtimeMinutes: z.number().int().min(0).max(1440).nullish(),
|
||||
workLoad: z
|
||||
.number()
|
||||
.int()
|
||||
.min(0)
|
||||
.max(10)
|
||||
.nullish()
|
||||
.describe(
|
||||
"0-10, INVERSE-oriented: a higher value is a heavier day, not a better one.",
|
||||
),
|
||||
workSatisfaction: z.number().int().min(0).max(10).nullish(),
|
||||
contactCircles: z
|
||||
.array(z.enum(CONTACT_CIRCLE_KEYS))
|
||||
.nullish()
|
||||
.describe(
|
||||
"Who the day's contact was with. Multi-select. Never scored: the count of people is not a good or a bad number.",
|
||||
),
|
||||
contactForm: z.enum(CONTACT_FORM_KEYS).nullish(),
|
||||
contactExtent: z.enum(CONTACT_EXTENT_KEYS).nullish(),
|
||||
contactQuality: z.number().int().min(0).max(10).nullish(),
|
||||
contactSupport: z.number().int().min(0).max(10).nullish(),
|
||||
leisureCategories: z.array(z.enum(LEISURE_CATEGORY_KEYS)).nullish(),
|
||||
leisureMinutes: z.number().int().min(0).max(1440).nullish(),
|
||||
leisureJoy: z.number().int().min(0).max(10).nullish(),
|
||||
leisureRecovery: z.number().int().min(0).max(10).nullish(),
|
||||
eventType: z
|
||||
.enum(EVENT_TYPE_KEYS)
|
||||
.nullish()
|
||||
.describe("One notable event. One per entry, not a list."),
|
||||
eventValence: z
|
||||
.number()
|
||||
.int()
|
||||
.min(-5)
|
||||
.max(5)
|
||||
.nullish()
|
||||
.describe("-5 (clearly bad) to +5 (clearly good)."),
|
||||
eventAt: z.iso.datetime({ offset: true }).nullish(),
|
||||
note: z
|
||||
.string()
|
||||
.max(500)
|
||||
.nullish()
|
||||
.describe(
|
||||
"One free-text note for the whole context. AES-256-GCM at rest; the ciphertext never rides the wire.",
|
||||
),
|
||||
})
|
||||
.meta({
|
||||
id: "MoodContext",
|
||||
description:
|
||||
"The day around a mood entry: work, contacts, leisure and one notable event. Every field optional. Sleep, activity, vitals and body symptoms are deliberately ABSENT — they are owned by their own modules and are read from there, never captured a second time here.",
|
||||
});
|
||||
|
||||
// ── Bulk mood backfill (iOS SyncMode) — mirrors the route's
|
||||
// `bulkPayloadSchema` / `bulkEntrySchema` and the batch-envelope response.
|
||||
const bulkMoodEntry = z
|
||||
@@ -212,6 +291,38 @@ const bulkMoodEntry = z
|
||||
"Rated mood factors; an out-of-scale rating marks THIS entry skipped, never the batch.",
|
||||
),
|
||||
note: z.string().max(500).optional(),
|
||||
a1: z
|
||||
.number()
|
||||
.int()
|
||||
.min(0)
|
||||
.max(10)
|
||||
.nullish()
|
||||
.describe(
|
||||
"Pleasantness, 0-10. Optional: the server DERIVES it from `mood` when the entry does not carry one, so an older build that sends only the five-point label still writes a complete row. A value sent here wins over the derivation.",
|
||||
),
|
||||
a2: z
|
||||
.number()
|
||||
.int()
|
||||
.min(0)
|
||||
.max(10)
|
||||
.nullish()
|
||||
.describe(
|
||||
'Stress, 0-10, INVERSE-oriented: a higher value is more stress. Stored exactly as set; a client that wants "up is better" flips the sign itself.',
|
||||
),
|
||||
a3: z.number().int().min(0).max(10).nullish().describe("Energy, 0-10."),
|
||||
a4: z
|
||||
.number()
|
||||
.int()
|
||||
.min(0)
|
||||
.max(10)
|
||||
.nullish()
|
||||
.describe("Connectedness, 0-10."),
|
||||
a5: z.number().int().min(0).max(10).nullish().describe("Stability, 0-10."),
|
||||
context: moodContextWire
|
||||
.nullish()
|
||||
.describe(
|
||||
"The day's context. Absent leaves a stored context untouched on a re-post; an empty one removes it.",
|
||||
),
|
||||
moodLoggedAt: z.iso
|
||||
.datetime({ offset: true })
|
||||
.describe("ISO instant the entry was logged."),
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
import { z } from "zod/v4";
|
||||
import type { ZodOpenApiObject } from "zod-openapi";
|
||||
import { measurementResource } from "./measurements";
|
||||
import { moodContextWire } from "./mood";
|
||||
import { dataEnvelope, stdResponses } from "./shared";
|
||||
|
||||
// ── Sync (v1.7.0 offline / server-optional) ─────────────────────────
|
||||
@@ -97,7 +98,29 @@ const syncMoodUpsert = z
|
||||
id: z.string(),
|
||||
date: z.string().describe("YYYY-MM-DD anchored to the row's `tz`."),
|
||||
mood: z.string(),
|
||||
score: z.number().int(),
|
||||
score: z.number().int().describe("The legacy 1-5 axis. Unchanged."),
|
||||
a1: z
|
||||
.number()
|
||||
.int()
|
||||
.nullable()
|
||||
.describe(
|
||||
"Pleasantness, 0-10. Server-derived from `mood` on every write, so this is populated even for rows a client posted without it. Consume the value; do not re-derive it.",
|
||||
),
|
||||
a2: z
|
||||
.number()
|
||||
.int()
|
||||
.nullable()
|
||||
.describe(
|
||||
"Stress, 0-10, INVERSE-oriented: a higher value is more stress. NULL when nobody answered it.",
|
||||
),
|
||||
a3: z.number().int().nullable().describe("Energy, 0-10, or null."),
|
||||
a4: z.number().int().nullable().describe("Connectedness, 0-10, or null."),
|
||||
a5: z.number().int().nullable().describe("Stability, 0-10, or null."),
|
||||
context: moodContextWire
|
||||
.nullable()
|
||||
.describe(
|
||||
"The day's context, or null when the entry carries none. Null and an object of nulls are different answers.",
|
||||
),
|
||||
tags: z.string().nullable().describe("JSON array of tag keys, or null."),
|
||||
note: z.string().nullable(),
|
||||
moodLoggedAt: z.iso.datetime({ offset: true }),
|
||||
|
||||
@@ -20,22 +20,55 @@ import {
|
||||
|
||||
// v1.4.25 W16b — typed workout batch ingest response envelope. Mirrors
|
||||
// the measurements batch shape but reports the `workouts` count rather
|
||||
// than the entries count, and the `skipped` field is reserved (the
|
||||
// Zod schema rejects malformed entries with a 400 before the per-entry
|
||||
// pass, so today's responses always carry an empty array).
|
||||
// than the entries count. `skipped` carries the entries the server
|
||||
// refused: an unusable external id, or a `samples` array that failed
|
||||
// validation (`reason: "invalid_samples"`).
|
||||
//
|
||||
// `enriched` says the entry matched a stored workout that had no
|
||||
// heart-rate series and the series it carried was attached. The
|
||||
// workout row itself was not written, so such an entry also counts
|
||||
// towards `duplicates`. That rule is part of the published contract,
|
||||
// not just a note here: it rides the field descriptions below, because
|
||||
// a client summing the counters has to know which bucket an
|
||||
// enrichment lands in.
|
||||
const workoutBatchEntryResult = z
|
||||
.object({
|
||||
index: z.number().int().nonnegative(),
|
||||
status: z.enum(["inserted", "duplicate", "skipped"]),
|
||||
reason: z.string().optional(),
|
||||
status: z
|
||||
.enum(["inserted", "duplicate", "enriched", "skipped"])
|
||||
.describe(
|
||||
"`inserted`: a new workout row. `duplicate`: the workout was already stored and nothing was written. `enriched`: the workout was already stored and the heart-rate series this entry carried was attached to it; the workout row itself was not written, and the entry also counts towards the top-level `duplicates`. `skipped`: the server refused the entry, see `reason`.",
|
||||
),
|
||||
reason: z
|
||||
.string()
|
||||
.optional()
|
||||
.describe(
|
||||
"Why a `skipped` entry was refused: `unstable_external_id` for an id that does not survive a client restart, `invalid_samples` for a heart-rate series that failed validation.",
|
||||
),
|
||||
})
|
||||
.meta({ id: "WorkoutBatchEntryResult" });
|
||||
|
||||
const workoutBatchResponse = z
|
||||
.object({
|
||||
processed: z.number().int().nonnegative(),
|
||||
inserted: z.number().int().nonnegative(),
|
||||
duplicates: z.number().int().nonnegative(),
|
||||
processed: z
|
||||
.number()
|
||||
.int()
|
||||
.nonnegative()
|
||||
.describe(
|
||||
"Entries in the request. Equals `inserted + duplicates + skipped.length`.",
|
||||
),
|
||||
inserted: z
|
||||
.number()
|
||||
.int()
|
||||
.nonnegative()
|
||||
.describe("Workout rows this request wrote."),
|
||||
duplicates: z
|
||||
.number()
|
||||
.int()
|
||||
.nonnegative()
|
||||
.describe(
|
||||
"Entries that wrote no workout row because the workout was already stored. The top-level counters count workout rows, so an entry reported as `enriched` counts here as well even though its heart-rate series was attached.",
|
||||
),
|
||||
skipped: z.array(
|
||||
z.object({
|
||||
index: z.number().int().nonnegative(),
|
||||
@@ -275,7 +308,7 @@ export const workoutPaths: NonNullable<ZodOpenApiObject["paths"]> = {
|
||||
tags: ["Measurements"],
|
||||
summary: "Typed workout batch ingest (v1.4.25 W16b)",
|
||||
description:
|
||||
"Server-side ingest endpoint for HKWorkout records (iOS) and Withings activity rows (server-to-server). Up to 100 workouts per call; nested route geometry (GeoJSON LineString) is capped at 20 000 points and stored in a 1:1 `WorkoutRoute` row keyed by `workoutId`. Idempotent via the `Idempotency-Key` header (replay window 24h). Per-entry status (`inserted | duplicate | skipped`) lets the iOS sync cursor checkpoint accurately. The request body ceiling is 5 MB enforced at the HTTP layer — clients above the ceiling receive a 413 with `workout.batch.payload_too_large`.",
|
||||
'Server-side ingest endpoint for HKWorkout records (iOS) and Withings activity rows (server-to-server). Up to 100 workouts per call; nested route geometry (GeoJSON LineString) is capped at 20 000 points and stored in a 1:1 `WorkoutRoute` row keyed by `workoutId`. Idempotent via the `Idempotency-Key` header (replay window 24h). Per-entry status (`inserted | duplicate | enriched | skipped`) lets the iOS sync cursor checkpoint accurately. An entry matching a stored workout is first-write-wins for the workout row; when it carries a `samples` array and the stored workout has no heart-rate series, the series is attached and the entry reports `enriched` (repeatable: a workout that already has a series is a no-op). An entry whose `samples` array fails validation is refused on its own with `reason: "invalid_samples"` — the rest of the batch still lands. The request body ceiling is 5 MB enforced at the HTTP layer — clients above the ceiling receive a 413 with `workout.batch.payload_too_large`.',
|
||||
requestBody: {
|
||||
required: true,
|
||||
content: { "application/json": { schema: createBatchWorkoutSchema } },
|
||||
|
||||
Reference in new issue
Block a user