Update models/schemas.py

models/schemas.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, EmailStr
-from typing import Optional, List, Literal
-from datetime import date, time
+from typing import Optional, List, Literal, Dict, Any
+from datetime import date, time, datetime
 
 # --- USER SCHEMAS ---
 class SignupForm(BaseModel):
@@ -13,42 +13,100 @@ class TokenResponse(BaseModel):
     access_token: str
     token_type: str
 
-# --- DOCTOR CREATION SCHEMA (Admin use only) ---
+# --- DOCTOR CREATION SCHEMA ---
 class DoctorCreate(BaseModel):
     matricule: str
     email: EmailStr
     password: str
     full_name: str
-    specialty: str  # ✅ added field
-
+    specialty: str
 
 # --- CONTACT INFO ---
 class ContactInfo(BaseModel):
     email: Optional[EmailStr] = None
     phone: Optional[str] = None
 
-# --- PATIENT SCHEMA ---
-class PatientCreate(BaseModel):
+# --- CONDITION SCHEMA ---
+class Condition(BaseModel):
+    id: str
+    code: str
+    status: Optional[str] = ""
+    onset_date: Optional[str] = None
+    recorded_date: Optional[str] = None
+    verification_status: Optional[str] = ""
+
+# --- MEDICATION SCHEMA ---
+class Medication(BaseModel):
+    id: str
+    name: str
+    status: str
+    prescribed_date: Optional[str] = None
+    requester: Optional[str] = ""
+    dosage: Optional[str] = ""
+
+# --- ENCOUNTER SCHEMA ---
+class Encounter(BaseModel):
+    id: str
+    type: str
+    status: str
+    period: Dict[str, str]
+    service_provider: Optional[str] = ""
+
+# --- NOTE SCHEMA ---
+class Note(BaseModel):
+    id: str
+    date: str
+    type: str
+    text: str
+    context: Optional[str] = ""
+    author: Optional[str] = "System"
+
+# --- PATIENT BASE SCHEMA ---
+class PatientBase(BaseModel):
     full_name: str
-    date_of_birth: date
     gender: str
-    notes: Optional[str] = ""
+    date_of_birth: str
+    address: Optional[str] = ""
+    city: Optional[str] = ""
+    state: Optional[str] = ""
+    postal_code: Optional[str] = ""
+    country: Optional[str] = "US"
+    marital_status: Optional[str] = "Never Married"
+    language: Optional[str] = "en"
+
+# --- PATIENT CREATE SCHEMA ---
+class PatientCreate(PatientBase):
+    conditions: Optional[List[Condition]] = []
+    medications: Optional[List[Medication]] = []
+    encounters: Optional[List[Encounter]] = []
+    notes: Optional[List[Note]] = []
+
+# --- PATIENT RESPONSE SCHEMA ---
+class Patient(PatientBase):
+    id: str
+    fhir_id: Optional[str] = None
+    source: Optional[str] = None
+    conditions: List[Condition] = []
+    medications: List[Medication] = []
+    encounters: List[Encounter] = []
+    notes: List[Note] = []
+    
+    class Config:
+        orm_mode = True
+
+# --- PATIENT UPDATE SCHEMA ---
+class PatientUpdate(BaseModel):
+    full_name: Optional[str] = None
+    gender: Optional[str] = None
+    date_of_birth: Optional[str] = None
     address: Optional[str] = None
-    national_id: Optional[str] = None
-    blood_type: Optional[str] = None
-    allergies: Optional[List[str]] = []
-    chronic_conditions: Optional[List[str]] = []
-    medications: Optional[List[str]] = []
-    emergency_contact_name: Optional[str] = None
-    emergency_contact_phone: Optional[str] = None
-    insurance_provider: Optional[str] = None
-    insurance_policy_number: Optional[str] = None
-    contact: Optional[ContactInfo] = None
-
-# --- APPOINTMENT SCHEMA ---
-class AppointmentCreate(BaseModel):
-    patient_id: str  # MongoDB ObjectId as string
-    doctor_id: str   # MongoDB ObjectId as string
-    date: date
-    time: time
-    reason: Optional[str] = None
+    city: Optional[str] = None
+    state: Optional[str] = None
+    postal_code: Optional[str] = None
+    country: Optional[str] = None
+    marital_status: Optional[str] = None
+    language: Optional[str] = None
+    conditions: Optional[List[Condition]] = None
+    medications: Optional[List[Medication]] = None
+    encounters: Optional[List[Encounter]] = None
+    notes: Optional[List[Note]] = None