Update app/main.py

app/main.py

@@ -31,7 +31,7 @@ from models.student import Student
 from models.exam import Exam, ExamBatch, ExamStudentRegistration
 from models.attendance import Attendance
 from models.student_comment import StudentComment
-from models.class_ import Class, ClassEnrollment
+from models.class_ import Class, ClassEnrollment, ClassMembershipPlan
 
 # Classes schemas + service
 from schemas.class_ import (
@@ -766,7 +766,52 @@ def get_admin_classes(db: Session = Depends(get_db)):
     List all classes (most recent first).
     """
     classes = class_service.get_classes(db)
-    return classes
+    # Add membership_plan_ids and schedule to each class
+    result = []
+    for cls in classes:
+        # Reconstruct schedule from days_of_week and class_time
+        days = cls.days_of_week.split(",") if cls.days_of_week else []
+        class_time_parts = cls.class_time.split("-") if cls.class_time and "-" in cls.class_time else [cls.class_time, ""]
+        start_time = class_time_parts[0].strip() if len(class_time_parts) > 0 else ""
+        end_time = class_time_parts[1].strip() if len(class_time_parts) > 1 else ""
+        
+        schedule = []
+        for day in days:
+            if day.strip():
+                schedule.append({
+                    "day": day.strip(),
+                    "start_time": start_time,
+                    "end_time": end_time,
+                    "time": f"{start_time}-{end_time}" if start_time and end_time else start_time or "",
+                })
+        
+        # If no schedule, create a default one
+        if not schedule:
+            schedule = [{"day": "Monday", "start_time": "", "end_time": "", "time": ""}]
+        
+        class_dict = {
+            "id": cls.id,
+            "name": cls.name,
+            "description": cls.description,
+            "class_time": cls.class_time,
+            "days_of_week": days,
+            "classes_per_week": cls.classes_per_week,
+            "max_students": cls.max_students,
+            "is_active": cls.is_active,
+            "coach_email": cls.coach_email,
+            "location": cls.location,
+            "created_at": cls.created_at,
+            "updated_at": cls.updated_at,
+            "membership_plan_ids": [
+                cmp.membership_plan_id 
+                for cmp in db.query(ClassMembershipPlan)
+                .filter(ClassMembershipPlan.class_id == cls.id)
+                .all()
+            ],
+            "schedule": schedule,
+        }
+        result.append(class_dict)
+    return result
 
 
 @app.post("/api/admin/classes", response_model=ClassOut, status_code=201)
@@ -778,7 +823,50 @@ def create_admin_class(
     Create a new class configuration.
     """
     db_class = class_service.create_class(db, class_in)
-    return db_class
+    # Get membership_plan_ids for response
+    membership_plan_ids = [
+        cmp.membership_plan_id 
+        for cmp in db.query(ClassMembershipPlan)
+        .filter(ClassMembershipPlan.class_id == db_class.id)
+        .all()
+    ]
+    # Reconstruct schedule
+    days = db_class.days_of_week.split(",") if db_class.days_of_week else []
+    class_time_parts = db_class.class_time.split("-") if db_class.class_time and "-" in db_class.class_time else [db_class.class_time, ""]
+    start_time = class_time_parts[0].strip() if len(class_time_parts) > 0 else ""
+    end_time = class_time_parts[1].strip() if len(class_time_parts) > 1 else ""
+    
+    schedule = []
+    for day in days:
+        if day.strip():
+            schedule.append({
+                "day": day.strip(),
+                "start_time": start_time,
+                "end_time": end_time,
+                "time": f"{start_time}-{end_time}" if start_time and end_time else start_time or "",
+            })
+    
+    if not schedule:
+        schedule = [{"day": "Monday", "start_time": "", "end_time": "", "time": ""}]
+    
+    # Convert to dict for response
+    class_dict = {
+        "id": db_class.id,
+        "name": db_class.name,
+        "description": db_class.description,
+        "class_time": db_class.class_time,
+        "days_of_week": days,
+        "classes_per_week": db_class.classes_per_week,
+        "max_students": db_class.max_students,
+        "is_active": db_class.is_active,
+        "coach_email": db_class.coach_email,
+        "location": db_class.location,
+        "created_at": db_class.created_at,
+        "updated_at": db_class.updated_at,
+        "membership_plan_ids": membership_plan_ids,
+        "schedule": schedule,
+    }
+    return class_dict
 
 
 @app.put("/api/admin/classes/{class_id}", response_model=ClassOut)
@@ -793,7 +881,50 @@ def update_admin_class(
     db_class = class_service.update_class(db, class_id, class_in)
     if not db_class:
         raise HTTPException(status_code=404, detail="Class not found")
-    return db_class
+    # Get membership_plan_ids for response
+    membership_plan_ids = [
+        cmp.membership_plan_id 
+        for cmp in db.query(ClassMembershipPlan)
+        .filter(ClassMembershipPlan.class_id == class_id)
+        .all()
+    ]
+    # Reconstruct schedule
+    days = db_class.days_of_week.split(",") if db_class.days_of_week else []
+    class_time_parts = db_class.class_time.split("-") if db_class.class_time and "-" in db_class.class_time else [db_class.class_time, ""]
+    start_time = class_time_parts[0].strip() if len(class_time_parts) > 0 else ""
+    end_time = class_time_parts[1].strip() if len(class_time_parts) > 1 else ""
+    
+    schedule = []
+    for day in days:
+        if day.strip():
+            schedule.append({
+                "day": day.strip(),
+                "start_time": start_time,
+                "end_time": end_time,
+                "time": f"{start_time}-{end_time}" if start_time and end_time else start_time or "",
+            })
+    
+    if not schedule:
+        schedule = [{"day": "Monday", "start_time": "", "end_time": "", "time": ""}]
+    
+    # Convert to dict for response
+    class_dict = {
+        "id": db_class.id,
+        "name": db_class.name,
+        "description": db_class.description,
+        "class_time": db_class.class_time,
+        "days_of_week": days,
+        "classes_per_week": db_class.classes_per_week,
+        "max_students": db_class.max_students,
+        "is_active": db_class.is_active,
+        "coach_email": db_class.coach_email,
+        "location": db_class.location,
+        "created_at": db_class.created_at,
+        "updated_at": db_class.updated_at,
+        "membership_plan_ids": membership_plan_ids,
+        "schedule": schedule,
+    }
+    return class_dict
 
 
 @app.delete("/api/admin/classes/{class_id}", status_code=204)