fix merge errors

Author: carlosmartinez

tests/services/mwl/test_c_find.py

@@ -114,7 +114,12 @@ def test_call_with_accession_number_filter(self, handler, mock_storage, mock_eve
         list(handler.call(mock_event))
 
         mock_storage.find_worklist_items.assert_called_once_with(
-            accession_number="ACC12345", modality=None, scheduled_date=None, scheduled_time=None, patient_id=None
+            accession_number="ACC12345",
+            modality=None,
+            scheduled_date=None,
+            scheduled_time=None,
+            patient_id=None,
+            patient_name=None,
         )
 
     def test_call_with_modality_filter(self, handler, mock_storage, mock_event):
@@ -144,7 +149,12 @@ 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(
-            accession_number=None, modality=None, scheduled_date="20260107", scheduled_time=None, patient_id=None
+            accession_number=None,
+            modality=None,
+            scheduled_date="20260107",
+            scheduled_time=None,
+            patient_id=None,
+            patient_name=None,
         )
 
     def test_call_with_time_filter(self, handler, mock_storage, mock_event):
@@ -159,7 +169,7 @@ def test_call_with_time_filter(self, handler, mock_storage, mock_event):
             accession_number=None,
             scheduled_time="100000",
             modality=None,
-            scheduled_date="20260107",
+            scheduled_date=None,
             patient_id=None,
             patient_name=None,
         )
@@ -186,7 +196,12 @@ def test_call_with_patient_name_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=None, patient_name="Smith*"
+            accession_number=None,
+            modality=None,
+            scheduled_date=None,
+            scheduled_time=None,
+            patient_id=None,
+            patient_name="Smith*",
         )
 
     def test_call_handles_storage_exception(self, handler, mock_storage, mock_event):

tests/services/test_storage.py

@@ -421,15 +421,17 @@ def test_find_worklist_items_with_date_and_time_range(self, mock_db, tmp_dir):
         )
 
     @pytest.mark.parametrize(
-        "dicom_pattern, sql_pattern",
+        "dicom_pattern, sql_pattern, operator",
         [
-            ("Smith*", "Smith%"),  # trailing wildcard
-            ("*Smith*", "%Smith%"),  # leading and trailing wildcard
-            ("Sm?th*", "Sm_th%"),  # single-character wildcard combined with trailing
-            ("Smith^Jane", "Smith^Jane"),  # exact name, no wildcards
+            ("Smith*", "Smith%", "LIKE"),  # trailing wildcard
+            ("*Smith*", "%Smith%", "LIKE"),  # leading and trailing wildcard
+            ("Sm?th*", "Sm_th%", "LIKE"),  # single-character wildcard combined with trailing
+            ("Smith^Jane", "Smith^Jane", "="),  # exact name, no wildcards — uses = not LIKE
         ],
     )
-    def test_find_worklist_items_patient_name_wildcard_conversion(self, mock_db, tmp_dir, dicom_pattern, sql_pattern):
+    def test_find_worklist_items_patient_name_wildcard_conversion(
+        self, mock_db, tmp_dir, dicom_pattern, sql_pattern, operator
+    ):
         mock_cursor = MagicMock()
         mock_cursor.fetchall.return_value = []
         mock_connection = MagicMock()
@@ -445,7 +447,7 @@ def test_find_worklist_items_patient_name_wildcard_conversion(self, mock_db, tmp
                 "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 UPPER(patient_name) LIKE UPPER(?) ORDER BY scheduled_date, scheduled_time"
+                f"FROM worklist_items WHERE UPPER(patient_name) {operator} UPPER(?) ORDER BY scheduled_date, scheduled_time"
             ),
             [sql_pattern],
         )