Update api/routes/patients.py

api/routes/patients.py

@@ -367,7 +367,7 @@ async def list_patients(
     skip: int = Query(0, ge=0)
 ):
     logger.info(f"Listing patients with search: {search}, limit: {limit}, skip: {skip}")
-    query = {}  # Removed the default "source": "synthea" filter
+    query = {}
     
     if search:
         query["$or"] = [
@@ -392,7 +392,7 @@ async def list_patients(
         "medications": 1,
         "encounters": 1,
         "notes": 1,
-        "source": 1  # Added source to projection
+        "source": 1
     }
     
     try:
@@ -431,7 +431,6 @@ async def list_patients(
             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}")
@@ -552,5 +551,55 @@ async def add_note(
             detail=f"Failed to add note: {str(e)}"
         )
 
+@router.delete("/patients/{patient_id}", status_code=status.HTTP_200_OK)
+async def delete_patient(
+    patient_id: str,
+    current_user: dict = Depends(get_current_user)
+):
+    """Delete a patient from the database"""
+    logger.info(f"Attempting to delete patient {patient_id} by user {current_user.get('email')}")
+    
+    if current_user.get('role') not in ['admin', 'doctor']:
+        logger.warning(f"Unauthorized delete attempt by {current_user.get('email')}")
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="Only administrators and doctors can delete patients"
+        )
+    
+    try:
+        # Attempt to delete patient by either _id or fhir_id
+        result = await patients_collection.delete_one({
+            "$or": [
+                {"_id": ObjectId(patient_id)},
+                {"fhir_id": patient_id}
+            ]
+        })
+        
+        if result.deleted_count == 0:
+            logger.warning(f"Patient not found for deletion: {patient_id}")
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Patient not found"
+            )
+        
+        logger.info(f"Successfully deleted patient {patient_id}")
+        return {
+            "status": "success",
+            "message": f"Patient {patient_id} deleted successfully"
+        }
+        
+    except ValueError as ve:
+        logger.error(f"Invalid patient ID format: {patient_id}, error: {str(ve)}")
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Invalid patient ID format"
+        )
+    except Exception as e:
+        logger.error(f"Failed to delete patient {patient_id}: {str(e)}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to delete patient: {str(e)}"
+        )
+
 # Export the router as 'patients' for api.__init__.py
 patients = router