Remove status clause from worklist queries

Modalities will likely need SCHEDULED and IN PROGRESS items at the very
least. Defaulting to SCHEDULED may obscure items.
Remove the status clause, we can implement this as a query parameter.

Author: steventux

src/server.py

@@ -15,9 +15,9 @@
 
 from services.dicom.c_echo import CEcho
 from services.dicom.c_store import CStore
+from services.mwl.c_find import CFind
 from services.mwl.n_create import NCreate
 from services.mwl.n_set import NSet
-from services.mwl.c_find import CFind
 from services.storage import MWLStorage, PACSStorage
 
 logger = logging.getLogger(__name__)

src/services/mwl/c_find.py

@@ -45,16 +45,14 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
         query_date = procedure_sequence[0].get("ScheduledProcedureStepStartDate")
 
         logger.debug(
-            "Query parameters: modality=%s, date=%s, patient_id=%s",
-            query_modality, query_date, query_patient_id
+            "Query parameters: modality=%s, date=%s, patient_id=%s", query_modality, query_date, query_patient_id
         )
 
         try:
             items = self.storage.find_worklist_items(
                 modality=query_modality if query_modality else None,
                 scheduled_date=query_date if query_date else None,
                 patient_id=query_patient_id if query_patient_id else None,
-                status="SCHEDULED",
             )
 
             logger.info("Found %s matching worklist items", len(items))

src/services/storage.py

@@ -358,7 +358,6 @@ def find_worklist_items(
         modality: Optional[str] = None,
         scheduled_date: Optional[str] = None,
         patient_id: Optional[str] = None,
-        status: str = "SCHEDULED",
     ) -> List[WorklistItem]:
         """
         Query worklist items with optional filters.
@@ -367,7 +366,6 @@ def find_worklist_items(
             modality: Filter by modality (e.g., "MG")
             scheduled_date: Filter by scheduled date (YYYYMMDD)
             patient_id: Filter by patient ID
-            status: Filter by status (default: "SCHEDULED")
 
         Returns:
             List of WorklistItem instances matching the criteria
@@ -376,22 +374,26 @@ def find_worklist_items(
             "SELECT accession_number, modality, patient_birth_date, patient_id, "
             "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
             "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
-            "FROM worklist_items WHERE status = ?"
+            "FROM worklist_items"
         )
-        params = [status]
+        where_clauses = []
+        params = []
 
         if modality:
-            query += " AND modality = ?"
+            where_clauses.append("modality = ?")
             params.append(modality)
 
         if scheduled_date:
-            query += " AND scheduled_date = ?"
+            where_clauses.append("scheduled_date = ?")
             params.append(scheduled_date)
 
         if patient_id:
-            query += " AND patient_id = ?"
+            where_clauses.append("patient_id = ?")
             params.append(patient_id)
 
+        if where_clauses:
+            query += " WHERE " + " AND ".join(where_clauses)
+
         query += " ORDER BY scheduled_date, scheduled_time"
 
         with self._get_connection() as conn:

tests/services/mwl/test_c_find.py

@@ -116,9 +116,7 @@ def test_call_with_modality_filter(self, handler, mock_storage, mock_event):
 
         list(handler.call(mock_event))
 
-        mock_storage.find_worklist_items.assert_called_once_with(
-            modality="MG", scheduled_date=None, patient_id=None, status="SCHEDULED"
-        )
+        mock_storage.find_worklist_items.assert_called_once_with(modality="MG", scheduled_date=None, patient_id=None)
 
     def test_call_with_date_filter(self, handler, mock_storage, mock_event):
         sps_item = Dataset()
@@ -129,7 +127,7 @@ def test_call_with_date_filter(self, handler, mock_storage, mock_event):
         list(handler.call(mock_event))
 
         mock_storage.find_worklist_items.assert_called_once_with(
-            modality=None, scheduled_date="20260107", patient_id=None, status="SCHEDULED"
+            modality=None, scheduled_date="20260107", patient_id=None
         )
 
     def test_call_with_patient_id_filter(self, handler, mock_storage, mock_event):
@@ -139,7 +137,7 @@ def test_call_with_patient_id_filter(self, handler, mock_storage, mock_event):
         list(handler.call(mock_event))
 
         mock_storage.find_worklist_items.assert_called_once_with(
-            modality=None, scheduled_date=None, patient_id="9876543210", status="SCHEDULED"
+            modality=None, scheduled_date=None, patient_id="9876543210"
         )
 
     def test_call_handles_storage_exception(self, handler, mock_storage, mock_event):

tests/services/test_storage.py

@@ -211,9 +211,9 @@ def test_find_worklist_items(self, mock_db, tmp_dir, result):
                 "SELECT accession_number, modality, patient_birth_date, patient_id, "
                 "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
                 "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
-                "FROM worklist_items WHERE status = ? ORDER BY scheduled_date, scheduled_time"
+                "FROM worklist_items ORDER BY scheduled_date, scheduled_time"
             ),
-            ["SCHEDULED"],
+            [],
         )
 
         assert len(results) == 1
@@ -236,9 +236,9 @@ def test_find_worklist_items_with_filters(self, mock_db, tmp_dir):
                 "SELECT accession_number, modality, patient_birth_date, patient_id, "
                 "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
                 "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
-                "FROM worklist_items WHERE status = ? AND patient_id = ? ORDER BY scheduled_date, scheduled_time"
+                "FROM worklist_items WHERE patient_id = ? ORDER BY scheduled_date, scheduled_time"
             ),
-            ["SCHEDULED", "999123456"],
+            ["999123456"],
         )
 
         mock_connection.reset_mock()
@@ -249,9 +249,9 @@ def test_find_worklist_items_with_filters(self, mock_db, tmp_dir):
                 "SELECT accession_number, modality, patient_birth_date, patient_id, "
                 "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
                 "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
-                "FROM worklist_items WHERE status = ? AND modality = ? ORDER BY scheduled_date, scheduled_time"
+                "FROM worklist_items WHERE modality = ? ORDER BY scheduled_date, scheduled_time"
             ),
-            ["SCHEDULED", "CT"],
+            ["CT"],
         )
 
         mock_connection.reset_mock()
@@ -262,10 +262,10 @@ def test_find_worklist_items_with_filters(self, mock_db, tmp_dir):
                 "SELECT accession_number, modality, patient_birth_date, patient_id, "
                 "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
                 "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
-                "FROM worklist_items WHERE status = ? AND scheduled_date = ? "
+                "FROM worklist_items WHERE scheduled_date = ? "
                 "ORDER BY scheduled_date, scheduled_time"
             ),
-            ["SCHEDULED", "20240101"],
+            ["20240101"],
         )
 
         mock_connection.reset_mock()
@@ -276,11 +276,11 @@ def test_find_worklist_items_with_filters(self, mock_db, tmp_dir):
                 "SELECT accession_number, modality, patient_birth_date, patient_id, "
                 "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
                 "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
-                "FROM worklist_items WHERE status = ? "
-                "AND modality = ? AND scheduled_date = ? AND patient_id = ? "
+                "FROM worklist_items "
+                "WHERE modality = ? AND scheduled_date = ? AND patient_id = ? "
                 "ORDER BY scheduled_date, scheduled_time"
             ),
-            ["SCHEDULED", "MG", "20240101", "999123456"],
+            ["MG", "20240101", "999123456"],
         )
 
     def test_get_worklist_item(self, mock_db, tmp_dir, result):