Update api/routes/patients.py

api/routes/patients.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, HTTPException, Depends, Query, status
+from fastapi import APIRouter, HTTPException, Depends, Query, status, Body
 from db.mongo import patients_collection
 from core.security import get_current_user
 from utils.db import create_indexes
@@ -26,76 +26,14 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-router = APIRouter()
+router = APIRouter(prefix="/ehr", tags=["patients"])
 
 # Configuration
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 SYNTHEA_DATA_DIR = BASE_DIR / "output" / "fhir"
 os.makedirs(SYNTHEA_DATA_DIR, exist_ok=True)
 
-@router.post("/ehr/patients/add", status_code=status.HTTP_201_CREATED)
-async def create_patient_ehr(
-    patient_data: PatientCreate,
-    current_user: dict = Depends(get_current_user)
-):
-    """Create a new patient in the database via /ehr/patients endpoint"""
-    logger.info(f"Creating new patient via /ehr/patients by user {current_user.get('email')}")
-    
-    if current_user.get('role') not in ['admin', 'doctor']:
-        logger.warning(f"Unauthorized create attempt by {current_user.get('email')}")
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="Only administrators and doctors can create patients"
-        )
-    
-    try:
-        # Prepare the patient document
-        patient_doc = patient_data.dict()
-        now = datetime.utcnow().isoformat()
-        
-        # Add system-generated fields
-        patient_doc.update({
-            "fhir_id": str(uuid.uuid4()),
-            "import_date": now,
-            "last_updated": now,
-            "source": "manual",
-            "created_by": current_user.get('email')
-        })
-        
-        # Ensure arrays exist even if empty
-        for field in ['conditions', 'medications', 'encounters', 'notes']:
-            if field not in patient_doc:
-                patient_doc[field] = []
-        
-        # Insert the patient document
-        result = await patients_collection.insert_one(patient_doc)
-        
-        # Return the created patient with the generated ID
-        created_patient = await patients_collection.find_one(
-            {"_id": result.inserted_id}
-        )
-        
-        if not created_patient:
-            logger.error("Failed to retrieve created patient")
-            raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail="Failed to retrieve created patient"
-            )
-        
-        created_patient["id"] = str(created_patient["_id"])
-        del created_patient["_id"]
-        
-        logger.info(f"Successfully created patient {created_patient['fhir_id']} via /ehr/patients")
-        return created_patient
-        
-    except Exception as e:
-        logger.error(f"Failed to create patient via /ehr/patients: {str(e)}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to create patient: {str(e)}"
-        )
-
-@router.post("/", status_code=status.HTTP_201_CREATED)
+@router.post("/patients", status_code=status.HTTP_201_CREATED)
 async def create_patient(
     patient_data: PatientCreate,
     current_user: dict = Depends(get_current_user)
@@ -260,7 +198,7 @@ async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict
     logger.warning(f"No valid patient data found in {file_path}")
     return None
 
-@router.post("/import", status_code=status.HTTP_201_CREATED)
+@router.post("/patients/import", status_code=status.HTTP_201_CREATED)
 async def import_patients(
     limit: int = Query(100, ge=1, le=1000),
     current_user: dict = Depends(get_current_user)
@@ -401,15 +339,15 @@ async def import_patients(
         )
 
 @router.get("/patients", response_model=List[dict])
-async def list_patients(
+async def get_patients(
     search: Optional[str] = Query(None),
     min_notes: int = Query(0, ge=0),
     min_conditions: int = Query(0, ge=0),
-    limit: int = Query(100, ge=1, le=500),
+    limit: int = Query(10, ge=1, le=100),
     skip: int = Query(0, ge=0)
 ):
-    logger.info(f"Listing patients with search: {search}, limit: {limit}, skip: {skip}")
-    query = {"source": "synthea"}
+    logger.info(f"Retrieving patients with search: {search}, limit: {limit}, skip: {skip}")
+    query = {}
     
     if search:
         query["$or"] = [
@@ -430,10 +368,10 @@ async def list_patients(
         "date_of_birth": 1,
         "city": 1,
         "state": 1,
-        "conditions": 1,
-        "medications": 1,
-        "encounters": 1,
-        "notes": 1
+        "conditions": {"$slice": 3},
+        "medications": {"$slice": 3},
+        "encounters": {"$slice": 3},
+        "notes": {"$slice": 3}
     }
     
     try:
@@ -465,15 +403,15 @@ async def list_patients(
         return patients
         
     except Exception as e:
-        logger.error(f"Failed to list patients: {str(e)}")
+        logger.error(f"Failed to retrieve patients: {str(e)}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=f"Failed to retrieve patients: {str(e)}"
         )
 
 @router.get("/patients/{patient_id}", response_model=dict)
-async def get_patient(patient_id: str):
-    logger.info(f"Retrieving patient: {patient_id}")
+async def get_patient_details(patient_id: str):
+    logger.info(f"Retrieving patient details: {patient_id}")
     try:
         patient = await patients_collection.find_one({
             "$or": [
@@ -520,7 +458,7 @@ async def get_patient(patient_id: str):
             }
         }
         
-        logger.info(f"Successfully retrieved patient: {patient_id}")
+        logger.info(f"Successfully retrieved patient details: {patient_id}")
         return response
         
     except ValueError as ve:
@@ -530,14 +468,14 @@ async def get_patient(patient_id: str):
             detail="Invalid patient ID format"
         )
     except Exception as e:
-        logger.error(f"Failed to retrieve patient {patient_id}: {str(e)}")
+        logger.error(f"Failed to retrieve patient details {patient_id}: {str(e)}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to retrieve patient: {str(e)}"
+            detail=f"Failed to retrieve patient details: {str(e)}"
         )
 
-@router.post("/{patient_id}/notes", status_code=status.HTTP_201_CREATED)
-async def add_note(
+@router.post("/patients/{patient_id}/notes", status_code=status.HTTP_201_CREATED)
+async def add_patient_note(
     patient_id: str,
     note: Note,
     current_user: dict = Depends(get_current_user)
@@ -591,5 +529,4 @@ async def add_note(
             detail=f"Failed to add note: {str(e)}"
         )
 
-# Export the router as 'patients' for api.__init__.py
-patients = router
+patients = router