Update app/schemas/class_.py

app/schemas/class_.py

@@ -1,34 +1,81 @@
 # app/schemas/class_.py
-from datetime import datetime, time
+from datetime import datetime
 from typing import List, Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, validator
 
 
-# ---------- CLASS SCHEMAS ----------
+# ---------- BASE SCHEMA ----------
 
 
 class ClassBase(BaseModel):
     name: str
     description: Optional[str] = None
+    # We keep class_time as a simple "HH:MM" string for API & DB
+    class_time: str
+    # Public API: always a list of day strings
     days_of_week: List[str]
-    class_time: Optional[time] = None
-    classes_per_week: Optional[int] = None
-    max_students: Optional[int] = None
+    classes_per_week: int = 1
+    max_students: int = 20
+
+    @validator("days_of_week", pre=True)
+    def ensure_list(cls, v):
+        """
+        Make sure days_of_week is always a list of strings.
+
+        - When coming from the DB via ORM, v is a string like "Monday,Wednesday".
+        - When coming from the request body, v is already a list like ["Monday"].
+        """
+        if v is None:
+            return []
+        if isinstance(v, str):
+            # Split comma-separated string from DB
+            return [d.strip() for d in v.split(",") if d.strip()]
+        return v
+
+
+# ---------- CREATE / UPDATE ----------
 
 
 class ClassCreate(ClassBase):
+    """
+    Schema used for creating a class.
+
+    Frontend sends:
+    {
+        "name": "...",
+        "description": "...",
+        "class_time": "18:00",
+        "days_of_week": ["Monday", "Wednesday"],
+        "classes_per_week": 2,
+        "max_students": 20
+    }
+    """
     pass
 
 
 class ClassUpdate(BaseModel):
+    """
+    All fields optional for partial update.
+    """
     name: Optional[str] = None
     description: Optional[str] = None
+    class_time: Optional[str] = None
     days_of_week: Optional[List[str]] = None
-    class_time: Optional[time] = None
     classes_per_week: Optional[int] = None
     max_students: Optional[int] = None
 
+    @validator("days_of_week", pre=True)
+    def ensure_list(cls, v):
+        if v is None:
+            return v
+        if isinstance(v, str):
+            return [d.strip() for d in v.split(",") if d.strip()]
+        return v
+
+
+# ---------- OUT / RESPONSE ----------
+
 
 class ClassOut(ClassBase):
     id: int
@@ -43,7 +90,6 @@ class ClassOut(ClassBase):
 
 
 class ClassEnrollmentBase(BaseModel):
-    # NOTE: plain string, not EmailStr (avoids extra dependency)
     student_email: str
     student_name: Optional[str] = None
 
@@ -56,11 +102,8 @@ class ClassEnrollmentOut(ClassEnrollmentBase):
     id: int
     class_id: int
     status: str
-    invited_at: datetime
-    activated_at: Optional[datetime] = None
-    removed_at: Optional[datetime] = None
-    created_at: datetime
-    updated_at: datetime
+    invited_at: Optional[datetime] = None
+    joined_at: Optional[datetime] = None
 
     class Config:
         orm_mode = True