mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-18 08:02:12 +00:00
feat(mood): derive pleasantness on every write path
- one helper resolves the level-A values for a write; the five writers call it instead of carrying their own copy of the derivation - the create schema takes a1 to a5, and a value the user set wins over the derived one; the batch request shape is untouched - both arms of both upserts restate the values, so a re-post cannot leave a stale reading beside a mood that has since changed - the JSON import derives from the row's own label rather than the file's score, which is the one place the two can disagree - correcting an entry's label re-derives pleasantness the way it re-derives the score; an explicit null takes an answer back - a round trip through all five writers against real Postgres asserts the rows agree and that nothing invents the other four values
This commit is contained in:
1 parent
ad4f5c04f0
commit
a1c78eceef
9 files changed
+555
-1
No files matched your search
@@ -41,6 +41,7 @@ import { recomputeMoodBucketsForEntry } from "@/lib/rollups/mood-rollups";
|
||||
import { MOOD_ENUM_BY_SCORE } from "@/lib/mood/labels";
|
||||
import { getScoreForMood } from "@/lib/validations/mood";
|
||||
import { moodDateKey, DEFAULT_TIMEZONE } from "@/lib/mood/date-key";
|
||||
import { deriveA1 } from "@/lib/mood/level-a";
|
||||
import {
|
||||
classifyExternalId,
|
||||
unstableExternalIdMessage,
|
||||
@@ -648,6 +649,10 @@ export async function logMcpMood(input: {
|
||||
tz,
|
||||
mood,
|
||||
score,
|
||||
// v1.37 — pleasantness derived from the same label the score comes
|
||||
// from. The tool still takes a 1-5 score; that is its input and it is
|
||||
// unchanged.
|
||||
moodA1: deriveA1(mood),
|
||||
note: null,
|
||||
noteEncrypted: encryptNote(note),
|
||||
source: MCP_SOURCE,
|
||||
|
||||
@@ -17,6 +17,7 @@ import type { Prisma, PrismaClient } from "@/generated/prisma/client";
|
||||
import { prisma as defaultPrisma } from "@/lib/db";
|
||||
import { MOOD_ENUM_BY_SCORE } from "@/lib/mood/labels";
|
||||
import { getScoreForMood } from "@/lib/validations/mood";
|
||||
import { deriveA1 } from "@/lib/mood/level-a";
|
||||
import { moodDateKey, DEFAULT_TIMEZONE } from "@/lib/mood/date-key";
|
||||
import { encryptNote } from "@/lib/crypto/note-cipher";
|
||||
import { invalidateUserMood } from "@/lib/cache/invalidate";
|
||||
@@ -79,6 +80,10 @@ export async function logTelegramMood(input: {
|
||||
tz,
|
||||
mood,
|
||||
score,
|
||||
// v1.37 — pleasantness derived from the same label the score comes
|
||||
// from, so a mood tapped in the chat carries the value a mood typed
|
||||
// into the web form would. Nothing here can answer the other four.
|
||||
moodA1: deriveA1(mood),
|
||||
// v1.23 — encrypt the note at rest; legacy plaintext column nulled.
|
||||
note: null,
|
||||
noteEncrypted: encryptNote(input.note ?? null),
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
/**
|
||||
* The one place a mood write resolves its five level-A values.
|
||||
*
|
||||
* Five writers reach `MoodEntry`, and every one of them sends exactly what it
|
||||
* sent before this existed: a five-point label and nothing else. The server
|
||||
* derives pleasantness (A1) from that label so a quick check-in is a full
|
||||
* entry rather than a degraded one, and so a Telegram row, an imported row and
|
||||
* a row typed into the web form all carry the same value for the same day.
|
||||
*
|
||||
* The other four are never derived. There is nothing in a five-point label to
|
||||
* derive stress, energy, connectedness or stability from, and a fabricated
|
||||
* value would read as an answer nobody gave — it would poison the trend and
|
||||
* any later model trained on these columns. They stay NULL until somebody
|
||||
* moves the slider.
|
||||
*/
|
||||
import { getA1ForMood } from "@/lib/validations/mood";
|
||||
|
||||
/** Level-A values as a client may send them, all optional. */
|
||||
export interface LevelAInput {
|
||||
a1?: number | null;
|
||||
a2?: number | null;
|
||||
a3?: number | null;
|
||||
a4?: number | null;
|
||||
a5?: number | null;
|
||||
}
|
||||
|
||||
/** Level-A values as they are written to `MoodEntry`. */
|
||||
export interface LevelAColumns {
|
||||
moodA1: number | null;
|
||||
stressA2: number | null;
|
||||
energyA3: number | null;
|
||||
connectionA4: number | null;
|
||||
stabilityA5: number | null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The five columns for a write of `mood`, with any explicit client value
|
||||
* winning over the derivation.
|
||||
*
|
||||
* A client that sends only a label gets the derived A1 and four NULLs. A
|
||||
* client that sends `a1` gets its own number — that is what makes the detail
|
||||
* sliders a real capture surface rather than a suggestion the server overrides
|
||||
* on the way to the database.
|
||||
*
|
||||
* Every field is stated explicitly, including the NULLs, because the callers
|
||||
* are upserts: on the `update:` arm an omitted field keeps a value from an
|
||||
* earlier post, and a stale stress reading sitting beside a mood the user just
|
||||
* changed is exactly the mismatch these columns exist to avoid. Callers whose
|
||||
* write semantics are per-field rather than whole-row (the PATCH route) build
|
||||
* their own object and use `deriveA1` directly.
|
||||
*/
|
||||
export function levelAForWrite(
|
||||
mood: string,
|
||||
explicit?: LevelAInput,
|
||||
): LevelAColumns {
|
||||
return {
|
||||
moodA1: explicit?.a1 ?? getA1ForMood(mood),
|
||||
stressA2: explicit?.a2 ?? null,
|
||||
energyA3: explicit?.a3 ?? null,
|
||||
connectionA4: explicit?.a4 ?? null,
|
||||
stabilityA5: explicit?.a5 ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
/** A1 for a five-point label — the derivation on its own, for writers that carry no level-A input. */
|
||||
export function deriveA1(mood: string): number {
|
||||
return getA1ForMood(mood);
|
||||
}
|
||||
|
||||
/** The five columns as a client reads them back. */
|
||||
export interface LevelAWire {
|
||||
a1: number | null;
|
||||
a2: number | null;
|
||||
a3: number | null;
|
||||
a4: number | null;
|
||||
a5: number | null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Turn a stored row's five columns into the wire keys the client sends.
|
||||
*
|
||||
* A read that answered `moodA1` while the write took `a1` would leave every
|
||||
* form mapping the pair by hand, and one of them would eventually map it
|
||||
* wrong. The names match in both directions.
|
||||
*/
|
||||
export function levelAForWire(row: {
|
||||
moodA1: number | null;
|
||||
stressA2: number | null;
|
||||
energyA3: number | null;
|
||||
connectionA4: number | null;
|
||||
stabilityA5: number | null;
|
||||
}): LevelAWire {
|
||||
return {
|
||||
a1: row.moodA1,
|
||||
a2: row.stressA2,
|
||||
a3: row.energyA3,
|
||||
a4: row.connectionA4,
|
||||
a5: row.stabilityA5,
|
||||
};
|
||||
}
|
||||
@@ -106,6 +106,14 @@ const ratedFactor = z.object({
|
||||
});
|
||||
const ratedFactors = z.array(ratedFactor).max(30);
|
||||
|
||||
// v1.37 — the five level-A self-state values, each 0-10. Optional on every
|
||||
// path: a client that sends only a five-point label still writes a complete
|
||||
// entry, because the server derives A1 from the label. A2 to A5 are only ever
|
||||
// what the user set, so an omitted one stays absent rather than defaulting to
|
||||
// the middle of the scale. The bound is the scale itself; `MOOD_DIMENSIONS`
|
||||
// (`src/lib/mood/dimensions.ts`) carries the anchors the numbers mean.
|
||||
const levelADimension = z.number().int().min(0).max(10);
|
||||
|
||||
export const createMoodEntrySchema = z
|
||||
.object({
|
||||
mood: moodLevelEnum,
|
||||
@@ -120,6 +128,14 @@ export const createMoodEntrySchema = z
|
||||
// `MoodEntryTagLink.rating`. Out-of-scale or non-RATED keys are
|
||||
// rejected (422) / dropped server-side per the catalog.
|
||||
ratedFactors: ratedFactors.optional(),
|
||||
// v1.37 — the five level-A values the detail sliders capture. Absent
|
||||
// means the user did not answer; `a1` absent means the server derives it
|
||||
// from `mood`, which keeps the one-tap check-in a full entry.
|
||||
a1: levelADimension.optional(),
|
||||
a2: levelADimension.optional(),
|
||||
a3: levelADimension.optional(),
|
||||
a4: levelADimension.optional(),
|
||||
a5: levelADimension.optional(),
|
||||
// v1.4.30 H-5 — first-class free-text note. Replaces the
|
||||
// `tags: ["note:<text>"]` workaround. Capped at 500 chars so the
|
||||
// Coach evidence shelf renders cleanly without truncating chips.
|
||||
@@ -155,6 +171,15 @@ export const updateMoodEntrySchema = z.object({
|
||||
// v1.12.0 — full replacement of the rated-factor set when present.
|
||||
// `null` clears every rated link; omit to leave them untouched.
|
||||
ratedFactors: ratedFactors.nullable().optional(),
|
||||
// v1.37 — level-A values on the edit path. Omitted leaves the stored value
|
||||
// alone; an explicit `null` clears it, which is how a user takes back an
|
||||
// answer they did not mean to give. Editing the five-point label without
|
||||
// sending `a1` re-derives A1, the same way it re-derives `score`.
|
||||
a1: levelADimension.nullable().optional(),
|
||||
a2: levelADimension.nullable().optional(),
|
||||
a3: levelADimension.nullable().optional(),
|
||||
a4: levelADimension.nullable().optional(),
|
||||
a5: levelADimension.nullable().optional(),
|
||||
note: z.string().max(500).nullable().optional(),
|
||||
// v1.17 W1b — same plausibility bound on the edit path.
|
||||
moodLoggedAt: validateEntryInstant(
|
||||
|
||||
Reference in new issue
Block a user