Minor errors fixed

Author: KushK04

KonditionExpo/contexts/WorkoutContext.tsx

@@ -5,6 +5,7 @@ import { useAuth } from '@/contexts/AuthContext'; // adjust if needed
 export interface Exercise {
   id: string;
   name: string;
+  description?: string;
   muscle_group: string;
   type: 'strength' | 'cardio' | 'flexibility';
 }
@@ -64,11 +65,27 @@ export const WorkoutProvider = ({ children }: { children: ReactNode }) => {
 
   const generateId = () => Math.random().toString(36).substr(2, 9);
 
+  const transformWorkoutForBackend = (workout: Workout) => ({
+    name: workout.name,
+    description: workout.notes || null,
+    scheduled_date: workout.date.toISOString(),
+    duration_minutes: workout.duration,
+    exercises: workout.exercises.map(ex => ({
+      name: ex.exercise.name,
+      description: ex.exercise.description || null,
+      category: ex.exercise.muscle_group, // or ex.exercise.type if that's better
+      sets: ex.sets.length,
+      reps: ex.sets.reduce((sum, s) => sum + (s.reps || 0), 0),
+      weight: ex.sets.reduce((max, s) => Math.max(max, s.weight || 0), 0),
+    })),
+  });
+
   const addWorkout = async (workout: Workout) => {
     try {
+      const payload = transformWorkoutForBackend(workout);
       const response = await axios.post(
         'http://localhost:8000/api/v1/workouts/', // Replace with deployment endpoint
-        workout,
+        payload,
         {
           headers: {
             Authorization: `Bearer ${token}`,
@@ -77,7 +94,16 @@ export const WorkoutProvider = ({ children }: { children: ReactNode }) => {
       );
       console.log("Response from POST /workouts: ", response);
       const savedWorkout = response.data;
-      setWorkouts(prev => [...prev, savedWorkout]);
+
+      const saved = {
+        ...response.data,
+        date: new Date(response.data.created_at),
+        exercises: [], // if backend doesn't return them
+        duration: response.data.duration_minutes || 0,
+      };
+  
+      setWorkouts(prev => [...prev, saved]);
+
     } catch (error) {
       console.error('Failed to save workout to backend:', error.response?.data || error.message);
     }

backend/app/api/routes/workouts.py

@@ -14,47 +14,26 @@
     WorkoutPublic,
     WorkoutsPublic,
     WorkoutWithExercisesPublic,
+    WorkoutWithExercisesCreate,
     Exercise,
     ExerciseCreate,
     ExerciseUpdate,
     ExercisePublic,
+    ExerciseNestedCreate
 )
 from app.crudFuncs import update_personal_bests_after_workout
 
 
 router = APIRouter(prefix="/workouts", tags=["workouts"])
 
 
-@router.post("/", response_model=WorkoutPublic)
+@router.post("/", response_model=WorkoutWithExercisesPublic)
 def create_workout(
     *,
     session: SessionDep,
     current_user: CurrentUser,
-    workout_in: WorkoutCreate = Body(
-        ...,
-        examples=[
-            {
-                "name": "Monday Strength Training",
-                "description": "Focus on upper body strength",
-                "scheduled_date": "2025-05-20T08:00:00Z",
-                "duration_minutes": 60
-            }
-        ],
-    )
+    workout_in: WorkoutWithExercisesCreate
 ) -> Any:
-    """
-    Create a new workout.
-    
-    This endpoint allows users to create a new workout plan with details such as name,
-    description, scheduled date, and expected duration.
-    
-    - **name**: Required. The name of the workout (1-255 characters)
-    - **description**: Optional. A detailed description of the workout (up to 1000 characters)
-    - **scheduled_date**: Optional. When the workout is scheduled to take place
-    - **duration_minutes**: Optional. The expected duration of the workout in minutes
-    
-    Returns the created workout with its ID and other metadata.
-    """
     workout = Workout(
         user_id=current_user.id,
         name=workout_in.name,
@@ -64,13 +43,33 @@ def create_workout(
         is_completed=False,
         created_at=datetime.utcnow(),
     )
-    
+
     session.add(workout)
     session.commit()
     session.refresh(workout)
-    
-    return workout
 
+    # Add nested exercises
+    for ex in workout_in.exercises:
+        exercise = Exercise(
+            workout_id=workout.id,
+            name=ex.name,
+            description=ex.description,
+            category=ex.category,
+            sets=ex.sets,
+            reps=ex.reps,
+            weight=ex.weight,
+        )
+        session.add(exercise)
+
+    session.commit()
+    session.refresh(workout)
+
+    # Load exercises manually
+    workout.exercises = session.exec(
+        select(Exercise).where(Exercise.workout_id == workout.id)
+    ).all()
+
+    return workout
 
 @router.get("/", response_model=WorkoutsPublic)
 def get_workouts(

backend/app/models/workout.py

@@ -149,6 +149,18 @@ class WorkoutsPublic(SQLModel):
     data: List[WorkoutPublic]
     count: int
 
+class ExerciseNestedCreate(SQLModel):
+    name: str
+    description: Optional[str] = None
+    category: str
+    sets: Optional[int] = None
+    reps: Optional[int] = None
+    weight: Optional[float] = None
+
+
+class WorkoutWithExercisesCreate(WorkoutCreate):
+    exercises: List[ExerciseNestedCreate] = []
+
 #Personal Bests Model - Related to Workouts
 class PersonalBest(SQLModel, table=True):
     id: UUID = Field(default_factory=uuid4, primary_key=True)