refactor: separate plan loading from tree building

Author: kriss145

src/modules/sharing/server/load-share-link.ts

@@ -4,8 +4,8 @@ import { getTranslations } from 'next-intl/server'
 import { getPayload } from 'payload'
 
 import config from '@/payload.config'
-import type { Plan } from '@/modules/training/plans'
-import { loadPlanItems } from '@/modules/training/plans/server'
+import type { PlanTree } from '@/modules/training/plans'
+import { loadPlanTree } from '@/modules/training/plans/server'
 import type { LoadShareLinkOutput } from '@/modules/sharing'
 
 export async function loadShareLink(token: string): Promise<LoadShareLinkOutput> {
@@ -32,10 +32,10 @@ export async function loadShareLink(token: string): Promise<LoadShareLinkOutput>
 
   const t = await getTranslations('share')
 
-  let planData: Plan[] | undefined
+  let planData: PlanTree[] | undefined
 
   if (permissions.includes('plan')) {
-    planData = await loadPlanItems(
+    planData = await loadPlanTree(
       payload,
       [planId],
       {

src/modules/sharing/types.ts

@@ -1,10 +1,10 @@
-import type { Plan } from '@/modules/training/plans'
+import type { PlanTree } from '@/modules/training/plans'
 
 export type LoadShareLinkOutput = {
   meta: {
     planTitle: string
     permissions: ('plan' | 'results')[]
     expiresAt: string
   }
-  plan?: Plan[]
+  plan?: PlanTree[]
 } | null

src/modules/training/components/exercise-card/exercise-card.tsx

@@ -3,7 +3,7 @@
 import React, { useState } from 'react'
 import { SeriesForm } from '@/modules/training/components/series-form'
 import { getTrackingFields, type MetricField } from '@/modules/training/exercises'
-import { getExerciseName, type Exercise } from '@/modules/training/plans'
+import { getExerciseName, type WorkoutExerciseTree } from '@/modules/training/plans'
 import type { SetLog } from '@/payload-types'
 import {
   toMetricFormValues,
@@ -25,13 +25,17 @@ export function ExerciseCard({
   onSaveNote,
   readOnly,
 }: {
-  exercise: Exercise
+  exercise: WorkoutExerciseTree
   sets: SetLog[]
   clientNote?: string
-  onAdd?: (exercise: Exercise, fields: MetricField[], values: MetricFormValues) => Promise<void>
+  onAdd?: (
+    exercise: WorkoutExerciseTree,
+    fields: MetricField[],
+    values: MetricFormValues,
+  ) => Promise<void>
   onUpdate?: (id: number, fields: MetricField[], values: MetricFormValues) => Promise<void>
   onDelete?: (id: number) => Promise<void>
-  onSaveNote?: (exercise: Exercise, note: string) => Promise<void>
+  onSaveNote?: (exercise: WorkoutExerciseTree, note: string) => Promise<void>
   readOnly?: boolean
 }) {
   const [open, setOpen] = useState(false)

src/modules/training/components/workout-plans/components/workout-pickers/workout-pickers.tsx

@@ -2,7 +2,7 @@
 
 import React from 'react'
 import { Button } from '@/components/ui/button'
-import type { Microcycle, Workout } from '@/modules/training/plans'
+import type { MicrocycleTree, WorkoutTree } from '@/modules/training/plans'
 
 type Id = number | string | null | undefined
 
@@ -11,9 +11,9 @@ export function MicrocyclePicker({
   activeMicrocycleId,
   onSelect,
 }: {
-  microcycles: Microcycle[]
+  microcycles: MicrocycleTree[]
   activeMicrocycleId: Id
-  onSelect: (microcycleId: Microcycle['id']) => void
+  onSelect: (microcycleId: MicrocycleTree['id']) => void
 }) {
   return (
     <div className="flex gap-1.5">
@@ -37,9 +37,9 @@ export function WorkoutPicker({
   activeWorkoutId,
   onSelect,
 }: {
-  workouts: Workout[]
+  workouts: WorkoutTree[]
   activeWorkoutId: Id
-  onSelect: (workoutId: Workout['id']) => void
+  onSelect: (workoutId: WorkoutTree['id']) => void
 }) {
   return (
     <div className="flex flex-wrap gap-1">

src/modules/training/components/workout-plans/hooks/use-workout-selection.ts

@@ -1,7 +1,7 @@
 'use client'
 
 import { useEffect, useMemo, useState, useSyncExternalStore } from 'react'
-import type { Microcycle, Plan, Workout } from '@/modules/training/plans'
+import type { MicrocycleTree, PlanTree, WorkoutTree } from '@/modules/training/plans'
 
 const STORAGE_KEY = 'training-app:active-workout-selection'
 const SSR_SNAPSHOT = '__SSR_SELECTION__'
@@ -17,7 +17,7 @@ const subscribeToSelection = (onStoreChange: () => void) => {
   return () => window.removeEventListener('storage', onStoreChange)
 }
 
-const firstAvailableSelection = (plans: Plan[]): WorkoutSelection => {
+const firstAvailableSelection = (plans: PlanTree[]): WorkoutSelection => {
   const plan = plans[0]
   const microcycle = plan?.microcycles[0]
   const workout = microcycle?.workouts[0]
@@ -29,7 +29,7 @@ const firstAvailableSelection = (plans: Plan[]): WorkoutSelection => {
   }
 }
 
-const isValidSelection = (plans: Plan[], selection: WorkoutSelection) => {
+const isValidSelection = (plans: PlanTree[], selection: WorkoutSelection) => {
   const plan = plans.find((item) => item.id === selection.planId)
   if (!plan) return false
 
@@ -40,15 +40,15 @@ const isValidSelection = (plans: Plan[], selection: WorkoutSelection) => {
 }
 
 export function useWorkoutSelection(
-  plans: Plan[],
+  plans: PlanTree[],
   options: { readOnly?: boolean },
 ): {
   resolvedSelection: WorkoutSelection
-  activePlan: Plan | null
-  activeMicrocycle: Microcycle | null
-  activeWorkout: Workout | null
-  selectPlan: (plan: Plan) => void
-  selectMicrocycle: (plan: Plan, microcycleId: number | string) => void
+  activePlan: PlanTree | null
+  activeMicrocycle: MicrocycleTree | null
+  activeWorkout: WorkoutTree | null
+  selectPlan: (plan: PlanTree) => void
+  selectMicrocycle: (plan: PlanTree, microcycleId: number | string) => void
   selectWorkout: (workoutId: number | string) => void
 } {
   const { readOnly } = options
@@ -82,7 +82,7 @@ export function useWorkoutSelection(
     window.localStorage.setItem(STORAGE_KEY, JSON.stringify(resolvedSelection))
   }, [plans, readOnly, resolvedSelection, storedSelectionRaw])
 
-  const selectPlan = (plan: Plan) => {
+  const selectPlan = (plan: PlanTree) => {
     const nextMicrocycle = plan.microcycles[0] ?? null
     const nextWorkout = nextMicrocycle?.workouts[0] ?? null
     setSelection({
@@ -92,7 +92,7 @@ export function useWorkoutSelection(
     })
   }
 
-  const selectMicrocycle = (plan: Plan, microcycleId: number | string) => {
+  const selectMicrocycle = (plan: PlanTree, microcycleId: number | string) => {
     const microcycle = plan.microcycles.find((item) => item.id === microcycleId) ?? null
     const nextWorkout = microcycle?.workouts[0] ?? null
     setSelection({

src/modules/training/components/workout-plans/workout-plans.tsx

@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button'
 import { StatusBadge } from '@/components/ui/status-badge'
 import { Surface } from '@/components/ui/surface'
 import { mutedTextClass } from '@/lib/class-names'
-import type { Plan } from '@/modules/training/plans'
+import type { PlanTree } from '@/modules/training/plans'
 import { ActiveContextBanner } from './components/active-context-banner'
 import { MicrocyclePicker, WorkoutPicker } from './components/workout-pickers'
 import { useWorkoutSelection } from './hooks/use-workout-selection'
@@ -16,7 +16,7 @@ export function WorkoutPlans({
   readOnly,
   showResults,
 }: {
-  plans: Plan[]
+  plans: PlanTree[]
   readOnly?: boolean
   showResults?: boolean
 }) {

src/modules/training/components/workout-tracker/hooks/use-workout-session.ts

@@ -3,7 +3,11 @@
 import { useEffect, useRef, useState } from 'react'
 import { sdk } from '@/lib/sdk'
 import type { MetricField } from '@/modules/training/exercises'
-import { getExerciseName, type Exercise, type Workout } from '@/modules/training/plans'
+import {
+  getExerciseName,
+  type WorkoutExerciseTree,
+  type WorkoutTree,
+} from '@/modules/training/plans'
 import { toSetLogMetricData, type MetricFormValues } from '@/modules/training/logs'
 import type { ExerciseLog, SetLog, WorkoutLog } from '@/payload-types'
 
@@ -13,7 +17,7 @@ const relationshipId = (
   relationship && typeof relationship === 'object' ? relationship.id : (relationship ?? null)
 
 export function useWorkoutSession(
-  workout: Workout,
+  workout: WorkoutTree,
   options: { readOnly?: boolean; showResults?: boolean },
 ) {
   const { readOnly, showResults } = options
@@ -132,19 +136,23 @@ export function useWorkoutSession(
       setSession(doc)
     }, 'Błąd zapisu czasu')
 
-  const addSet = (ex: Exercise, fields: MetricField[], values: MetricFormValues) =>
+  const addSet = (
+    exercise: WorkoutExerciseTree,
+    fields: MetricField[],
+    values: MetricFormValues,
+  ) =>
     runMutation(async () => {
       const s = await ensureSession()
-      const setNumber = setsForRow(ex.id).length + 1
-      const exerciseName = getExerciseName(ex)
+      const setNumber = setsForRow(exercise.id).length + 1
+      const exerciseName = getExerciseName(exercise)
       const doc = await sdk.create({
         collection: 'set-logs',
         depth: 0,
         data: {
           session: s.id,
-          exercise: ex.exercise?.id ?? undefined,
+          exercise: exercise.exercise?.id ?? undefined,
           exerciseName,
-          exerciseRow: ex.id,
+          exerciseRow: exercise.id,
           setNumber,
           ...toSetLogMetricData(fields, values),
         },
@@ -183,11 +191,11 @@ export function useWorkoutSession(
       setSession(doc)
     }, 'Błąd zapisu notatki')
 
-  const saveExerciseNote = (ex: Exercise, note: string) =>
+  const saveExerciseNote = (exercise: WorkoutExerciseTree, note: string) =>
     runMutation(async () => {
       const s = await ensureSession()
-      const rowId = ex.id
-      const exerciseName = getExerciseName(ex)
+      const rowId = exercise.id
+      const exerciseName = getExerciseName(exercise)
       const existing = exerciseNotes.find(
         (entry) => relationshipId(entry.exerciseRow) === rowId,
       )
@@ -205,7 +213,7 @@ export function useWorkoutSession(
             depth: 0,
             data: {
               session: s.id,
-              exercise: ex.exercise?.id ?? undefined,
+              exercise: exercise.exercise?.id ?? undefined,
               exerciseName,
               exerciseRow: rowId,
               note: trimmed,

src/modules/training/components/workout-tracker/workout-tracker.tsx

@@ -7,15 +7,15 @@ import { Alert } from '@/components/ui/alert'
 import { ExerciseCard } from '@/modules/training/components/exercise-card'
 import { NoteField } from '@/modules/training/components/note-field'
 import { SessionTimesBadge, SessionTimesForm } from '@/modules/training/components/session-times'
-import type { Workout } from '@/modules/training/plans'
+import type { WorkoutTree } from '@/modules/training/plans'
 import { useWorkoutSession } from './hooks/use-workout-session'
 
 export function WorkoutTracker({
   workout,
   readOnly,
   showResults,
 }: {
-  workout: Workout
+  workout: WorkoutTree
   readOnly?: boolean
   showResults?: boolean
 }) {