Rename CFindHandler to CFind for consistency

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 CFindHandler
 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__)
@@ -106,7 +106,7 @@ def start(self):
         self.ae.add_supported_context(ModalityPerformedProcedureStep)
 
         handlers = [
-            (evt.EVT_C_FIND, CFindHandler(self.storage).call),
+            (evt.EVT_C_FIND, CFind(self.storage).call),
             (evt.EVT_N_CREATE, NCreate(self.storage).call),
             (evt.EVT_N_SET, NSet(self.storage).call),
         ]

src/services/mwl/c_find.py

@@ -16,7 +16,7 @@
 logger = logging.getLogger(__name__)
 
 
-class CFindHandler:
+class CFind:
     """Handler for C-FIND worklist queries."""
 
     def __init__(self, storage: MWLStorage):
@@ -44,7 +44,10 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
         query_modality = procedure_sequence[0].get("Modality")
         query_date = procedure_sequence[0].get("ScheduledProcedureStepStartDate")
 
-        logger.debug(f"Query parameters: modality={query_modality}, date={query_date}, patient_id={query_patient_id}")
+        logger.debug(
+            "Query parameters: modality=%s, date=%s, patient_id=%s",
+            query_modality, query_date, query_patient_id
+        )
 
         try:
             items = self.storage.find_worklist_items(
@@ -54,7 +57,7 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
                 status="SCHEDULED",
             )
 
-            logger.info(f"Found {len(items)} matching worklist items")
+            logger.info("Found %s matching worklist items", len(items))
 
             for item in items:
                 response_ds = self._build_worklist_response(item)
@@ -63,7 +66,7 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
             yield SUCCESS, None
 
         except Exception as e:
-            logger.error(f"Error processing C-FIND request: {e}", exc_info=True)
+            logger.error("Error processing C-FIND request: %s", e, exc_info=True)
             yield FAILURE, None
 
     def _build_worklist_response(self, item: WorklistItem) -> Dataset:
@@ -97,6 +100,6 @@ def _build_worklist_response(self, item: WorklistItem) -> Dataset:
 
         ds.ScheduledProcedureStepSequence = [sps_item]
 
-        logger.debug(f"Built worklist response for accession {item.accession_number}")
+        logger.debug("Built worklist response for accession %s", item.accession_number)
 
         return ds

tests/integration/test_c_find_returns_worklist_items.py

@@ -5,7 +5,7 @@
 from pydicom.uid import generate_uid
 
 from services.dicom import PENDING, SUCCESS
-from services.mwl.c_find import CFindHandler
+from services.mwl.c_find import CFind
 from services.storage import MWLStorage, WorklistItem
 
 
@@ -63,7 +63,7 @@ def event(self):
         return event
 
     def test_cfind_returns_scheduled_items(self, event, storage):
-        results = list(CFindHandler(storage).call(event))
+        results = list(CFind(storage).call(event))
         assert len(results) == 3
 
         status, ds = results[0]
@@ -99,7 +99,7 @@ def test_cfind_returns_scheduled_items(self, event, storage):
     def test_cfind_filters_by_scheduled_date(self, event, storage):
         event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate = "20240101"
 
-        results = list(CFindHandler(storage).call(event))
+        results = list(CFind(storage).call(event))
 
         assert len(results) == 2
 
@@ -137,7 +137,7 @@ def test_cfind_filters_by_modality(self, event, storage):
 
         event.identifier.ScheduledProcedureStepSequence[0].Modality = "MG"
 
-        results = list(CFindHandler(storage).call(event))
+        results = list(CFind(storage).call(event))
 
         assert len(results) == 3
 
@@ -156,7 +156,7 @@ def test_cfind_filters_by_modality(self, event, storage):
     def test_cfind_filters_by_patient_id(self, event, storage):
         event.identifier.PatientID = "999234567"
 
-        results = list(CFindHandler(storage).call(event))
+        results = list(CFind(storage).call(event))
 
         assert len(results) == 2
 

tests/services/mwl/test_c_find_handler.py tests/services/mwl/test_c_find.pytests/services/mwl/test_c_find_handler.py renamed to tests/services/mwl/test_c_find.py

@@ -6,7 +6,7 @@
 from pydicom import Dataset
 
 from services.dicom import FAILURE, PENDING, SUCCESS
-from services.mwl.c_find import CFindHandler
+from services.mwl.c_find import CFind
 from services.storage import WorklistItem
 
 
@@ -17,7 +17,7 @@ def mock_storage():
 
 @pytest.fixture
 def handler(mock_storage):
-    return CFindHandler(mock_storage)
+    return CFind(mock_storage)
 
 
 @pytest.fixture
@@ -46,8 +46,8 @@ def sample_worklist_item():
     }
 
 
-class TestCFindHandler:
-    """Tests for CFindHandler class."""
+class TestCFind:
+    """Tests for CFind class."""
 
     def test_call_with_no_results(self, handler, mock_storage, mock_event):
         mock_storage.find_worklist_items.return_value = []