Update api/routes.py

api/routes.py

@@ -5,11 +5,10 @@ from db.mongo import users_collection, patients_collection, appointments_collect
 from core.security import hash_password, verify_password, create_access_token, get_current_user
 from datetime import datetime
 from bson import ObjectId
-from bson.errors import InvalidId
 from typing import Optional, List
 from pydantic import BaseModel
-import httpx
 from pymongo import UpdateOne
+import httpx
 
 router = APIRouter()
 
@@ -55,22 +54,6 @@ async def create_doctor(data: DoctorCreate):
     await users_collection.insert_one(user_doc)
     return {"success": True, "message": "Doctor account created"}
 
-# --- GET ALL DOCTORS ---
-@router.get("/doctors")
-async def list_doctors():
-    cursor = users_collection.find({"role": "doctor"})
-    doctors = []
-    async for doc in cursor:
-        doctors.append({
-            "id": str(doc["_id"]),
-            "full_name": doc.get("full_name", ""),
-            "email": doc.get("email", ""),
-            "matricule": doc.get("matricule", ""),
-            "specialty": doc.get("specialty", ""),
-            "created_at": doc.get("created_at"),
-        })
-    return doctors
-
 # --- LOGIN ---
 @router.post("/login", response_model=TokenResponse)
 async def login(form_data: OAuth2PasswordRequestForm = Depends()):
@@ -98,42 +81,7 @@ async def get_me(current_user: dict = Depends(get_current_user)):
         "created_at": user.get("created_at", "")
     }
 
-# --- ADD NEW PATIENT ---
-@router.post("/patients")
-async def add_patient(data: PatientCreate, current_user: dict = Depends(get_current_user)):
-    if current_user.get("role") != "doctor":
-        raise HTTPException(status_code=403, detail="Only doctors can add patients")
-
-    patient_doc = {
-        **data.dict(),
-        "date_of_birth": datetime.combine(data.date_of_birth, datetime.min.time()),
-        "contact": data.contact.dict() if data.contact else {},
-        "created_by": current_user["email"],
-        "created_at": datetime.utcnow()
-    }
-    result = await patients_collection.insert_one(patient_doc)
-    return {"id": str(result.inserted_id), "message": "Patient created successfully"}
-
-# --- GET ALL PATIENTS ---
-@router.get("/patients")
-async def list_patients(current_user: dict = Depends(get_current_user)):
-    if current_user.get("role") != "doctor":
-        raise HTTPException(status_code=403, detail="Only doctors can view patients")
-
-    cursor = patients_collection.find({"created_by": current_user["email"]})
-    patients = []
-    async for p in cursor:
-        patients.append({
-            "id": str(p["_id"]),
-            "full_name": p.get("full_name", ""),
-            "date_of_birth": p.get("date_of_birth"),
-            "gender": p.get("gender", ""),
-            "notes": p.get("notes", "")
-        })
-    return patients
-
-# --- IMPORT FROM PUBLIC FHIR API ---
-
+# --- FETCH AND STORE FHIR PATIENTS ---
 @router.post("/ehr/fetch-from-api")
 async def fetch_and_store_patients_from_fhir():
     fhir_patients_url = "https://hapi.fhir.org/baseR4/Patient?_count=50"
@@ -141,23 +89,20 @@ async def fetch_and_store_patients_from_fhir():
 
     try:
         async with httpx.AsyncClient() as client:
-            # Fetch patients
             patient_res = await client.get(fhir_patients_url)
             if patient_res.status_code != 200:
                 raise HTTPException(status_code=502, detail="Failed to fetch patients")
             patient_entries = patient_res.json().get("entry", [])
 
-            # Fetch encounters
             encounter_res = await client.get(fhir_encounters_url)
             if encounter_res.status_code != 200:
                 raise HTTPException(status_code=502, detail="Failed to fetch encounters")
             encounter_entries = encounter_res.json().get("entry", [])
 
-        # Parse encounter notes grouped by patient ID
         patient_notes = {}
         for entry in encounter_entries:
             resource = entry.get("resource", {})
-            ref = resource.get("subject", {}).get("reference")  # e.g., "Patient/abc123"
+            ref = resource.get("subject", {}).get("reference")
             if not ref or "note" not in resource:
                 continue
 
@@ -173,10 +118,7 @@ async def fetch_and_store_patients_from_fhir():
             name_info = resource.get("name", [{}])[0]
             address_info = resource.get("address", [{}])[0]
 
-            given = name_info.get("given", [""])[0]
-            family = name_info.get("family", "")
-            full_name = f"{given} {family}".strip()
-
+            full_name = f"{name_info.get('given', [''])[0]} {name_info.get('family', '')}".strip()
             gender = resource.get("gender")
             birth_date = resource.get("birthDate")
             address = address_info.get("line", [""])[0]
@@ -184,7 +126,6 @@ async def fetch_and_store_patients_from_fhir():
             state = address_info.get("state", "")
             zip_code = address_info.get("postalCode", "")
 
-            # Skip if any essential field is missing
             if not all([fhir_id, full_name, gender, birth_date, address, city, state, zip_code]):
                 continue
 
@@ -219,6 +160,8 @@ async def fetch_and_store_patients_from_fhir():
 
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
+
+# --- GET FHIR PATIENTS ---
 @router.get("/ehr/fhir-patients")
 async def list_fhir_patients():
     cursor = patients_collection.find({"fhir_id": {"$exists": True}})
@@ -229,5 +172,22 @@ async def list_fhir_patients():
             "full_name": p.get("full_name"),
             "gender": p.get("gender"),
             "date_of_birth": p.get("date_of_birth"),
+            "notes": p.get("notes", [])
         })
     return patients
+
+# --- UPDATE A FHIR PATIENT ---
+@router.patch("/ehr/fhir-patients/{patient_id}")
+async def update_fhir_patient(patient_id: str, payload: dict = Body(...), current_user: dict = Depends(get_current_user)):
+    if current_user.get("role") != "doctor":
+        raise HTTPException(status_code=403, detail="Only doctors can update patient records")
+
+    try:
+        patient = await patients_collection.find_one({"_id": ObjectId(patient_id)})
+        if not patient:
+            raise HTTPException(status_code=404, detail="Patient not found")
+
+        await patients_collection.update_one({"_id": ObjectId(patient_id)}, {"$set": payload})
+        return {"message": "Patient updated successfully"}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))