Update api/routes.py

api/routes.py

@@ -1,15 +1,15 @@
-from fastapi import APIRouter, HTTPException, Depends, Body
+from fastapi import APIRouter, HTTPException, Depends
 from fastapi.security import OAuth2PasswordRequestForm
 from models.schemas import SignupForm, TokenResponse, PatientCreate, DoctorCreate, AppointmentCreate
 from db.mongo import users_collection, patients_collection, appointments_collection
 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 typing import Optional
 from pymongo import UpdateOne
+import json
+from pathlib import Path
+import traceback
 
 router = APIRouter()
 
@@ -55,22 +55,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,79 +82,65 @@ 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 FHIR (Switch to mock source with full data) ---
+# --- IMPORT MOCKED FHIR PATIENTS ---
 @router.post("/ehr/fetch-from-api")
 async def fetch_and_store_patients_from_fhir():
-    try:
-        async with httpx.AsyncClient(timeout=30.0) as client:
-            response = await client.get("https://txagent-medical-data.s3.amazonaws.com/fhir_mock_patients.json")
+    json_path = Path("fhir_mock_patients.json")
 
-        if response.status_code != 200:
-            raise HTTPException(status_code=502, detail="Failed to fetch mock FHIR patients")
+    if not json_path.exists():
+        raise HTTPException(status_code=404, detail="Mock FHIR JSON file not found")
 
-        raw_data = response.json()
-        valid_patients = []
+    try:
+        with open(json_path, "r", encoding="utf-8") as f:
+            data = json.load(f)
 
-        for resource in raw_data:
-            if not all(k in resource for k in ("fhir_id", "full_name", "gender", "date_of_birth", "address", "city", "state", "zip", "notes")):
+        valid_patients = []
+        for patient in data.get("entry", []):
+            resource = patient.get("resource", {})
+            fhir_id = resource.get("id")
+            name = resource.get("name", [{}])[0]
+            full_name = f"{name.get('given', [''])[0]} {name.get('family', '')}".strip()
+            gender = resource.get("gender")
+            birth_date = resource.get("birthDate")
+
+            address_data = resource.get("address", [{}])[0]
+            address = address_data.get("line", [""])[0]
+            city = address_data.get("city", "")
+            state = address_data.get("state", "")
+            zip_code = address_data.get("postalCode", "")
+
+            notes = []
+            for n in resource.get("note", []):
+                if n.get("text"):
+                    notes.append(n["text"])
+
+            if not all([fhir_id, full_name, gender, birth_date, address, city, state, zip_code, notes]):
                 continue
 
             valid_patients.append({
-                "fhir_id": resource["fhir_id"],
-                "full_name": resource["full_name"],
-                "gender": resource["gender"],
-                "date_of_birth": resource["date_of_birth"],
-                "address": resource["address"],
-                "city": resource["city"],
-                "state": resource["state"],
-                "zip": resource["zip"],
-                "notes": resource["notes"],
+                "fhir_id": fhir_id,
+                "full_name": full_name,
+                "gender": gender,
+                "date_of_birth": birth_date,
+                "address": address,
+                "city": city,
+                "state": state,
+                "zip": zip_code,
+                "notes": notes,
                 "created_at": datetime.utcnow()
             })
 
         if not valid_patients:
-            return {"message": "No complete patients in mock file."}
+            return {"message": "No valid patients found in JSON."}
 
         result = await patients_collection.insert_many(valid_patients)
-        return {"message": "Mock FHIR patients imported", "count": len(result.inserted_ids)}
+        return {"message": "Patients imported", "count": len(result.inserted_ids)}
 
     except Exception as e:
+        traceback.print_exc()
         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}})
@@ -181,5 +151,6 @@ 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