diff --git a/packages/server/src/routers/recovery.test.ts b/packages/server/src/routers/recovery.test.ts index a118f07ad6..49d3b5edd4 100644 --- a/packages/server/src/routers/recovery.test.ts +++ b/packages/server/src/routers/recovery.test.ts @@ -1421,11 +1421,11 @@ describe("recoveryRouter.strainTarget", () => { }); } - it("omits the strain target when no recovery summary exists", async () => { + it("returns null when no recovery summary exists", async () => { const caller = setup({ readinessRows: [] }); const result = await caller.strainTarget({}); - expect(result).toBeUndefined(); + expect(result).toBeNull(); }); it("reads daily loads from the compact activity load read model", async () => { diff --git a/packages/server/src/routers/recovery.ts b/packages/server/src/routers/recovery.ts index 788edcd392..78e3cfa0ab 100644 --- a/packages/server/src/routers/recovery.ts +++ b/packages/server/src/routers/recovery.ts @@ -129,20 +129,22 @@ export interface ReadinessRow { weights: ReadinessWeights; } -export interface StrainTargetResult { - targetStrain: number; - currentStrain: number; - currentStrainSource?: "activity" | "none"; - currentPhysiologyLoad?: number | null; - progressPercent: number; - zone: "Push" | "Maintain" | "Recovery"; - explanation: string; - dailyLoad?: number; - acuteLoad?: number; - chronicLoad?: number; - workloadRatio?: number | null; - readinessScore?: number; -} +const strainTargetResultSchema = z.object({ + targetStrain: z.number(), + currentStrain: z.number(), + currentStrainSource: z.enum(["activity", "none"]).optional(), + currentPhysiologyLoad: z.number().nullable().optional(), + progressPercent: z.number(), + zone: z.enum(["Push", "Maintain", "Recovery"]), + explanation: z.string(), + dailyLoad: z.number().optional(), + acuteLoad: z.number().optional(), + chronicLoad: z.number().optional(), + workloadRatio: z.number().nullable().optional(), + readinessScore: z.number().optional(), +}); + +export type StrainTargetResult = z.infer; const strainTargetReadinessRowSchema = z.object({ date: dateStringSchema, @@ -605,7 +607,8 @@ export const recoveryRouter = router({ */ strainTarget: cachedProtectedQuery({ maxAge: CacheTTL.MEDIUM }) .input(z.object({ days: z.number().default(30), endDate: endDateSchema })) - .query(async ({ ctx, input }): Promise => { + .output(strainTargetResultSchema.nullable()) + .query(async ({ ctx, input }): Promise => { const sensorStore = requireSensorStore(ctx.sensorStore, "recovery.strainTarget"); const recoveryAccessWindowClause = ctx.accessWindow?.kind === "limited" @@ -678,7 +681,7 @@ export const recoveryRouter = router({ ); const readinessMetrics = readinessRows[0]; - if (!readinessMetrics) return undefined; + if (!readinessMetrics) return null; const params = getEffectiveParams(await loadPersonalizedParams(ctx.db, ctx.userId)); const components: ReadinessComponents = { diff --git a/packages/web/src/components/DailyOverview.tsx b/packages/web/src/components/DailyOverview.tsx index 03a09d3ba6..d96cd6384e 100644 --- a/packages/web/src/components/DailyOverview.tsx +++ b/packages/web/src/components/DailyOverview.tsx @@ -31,7 +31,7 @@ interface DailyOverviewProps { readiness: ReadinessRow[] | undefined; workloadRatio: WorkloadRatioResult | undefined; sleepPerformance: SleepPerformanceInfo | null | undefined; - strainTarget?: StrainTargetResult | undefined; + strainTarget?: StrainTargetResult | null; readinessLoading?: boolean; workloadLoading?: boolean; strainTargetLoading?: boolean; @@ -217,7 +217,7 @@ function StrainBreakdown({ strainTarget, }: { workloadRatio: WorkloadRatioResult; - strainTarget?: StrainTargetResult; + strainTarget?: StrainTargetResult | null; }) { const today = workloadRatio.timeSeries[workloadRatio.timeSeries.length - 1]; const acuteLoad = today?.acuteLoad ?? 0;