Delegate to update_status

Author: carlosmartinez

src/services/storage.py

@@ -493,23 +493,14 @@ def update_status(
 
     def mark_in_progress(self, accession_number: str) -> bool:
         """
-        Transition worklist item from SCHEDULED to IN_PROGRESS.
+        Transition worklist item from SCHEDULED to IN PROGRESS.
 
         Returns True if the status was updated, False if not found or already past SCHEDULED.
         """
-        with self._get_connection() as conn:
-            cursor = conn.execute(
-                """
-                UPDATE worklist_items
-                SET status = 'IN PROGRESS',
-                    updated_at = CURRENT_TIMESTAMP
-                WHERE accession_number = ?
-                  AND status = 'SCHEDULED'
-                """,
-                (accession_number,),
-            )
-            conn.commit()
-            return cursor.rowcount > 0
+        item = self.get_worklist_item(accession_number)
+        if item is None or item.status != "SCHEDULED":
+            return False
+        return self.update_status(accession_number, "IN PROGRESS") is not None
 
     def update_study_instance_uid(self, accession_number: str, study_instance_uid: str) -> bool:
         """

tests/services/dicom/test_c_store.py

@@ -141,6 +141,13 @@ def test_mark_in_progress_not_called_on_failure(self, mock_storage, mock_event):
 
         mock_mwl.mark_in_progress.assert_not_called()
 
+    def test_mark_in_progress_error_does_not_fail_store(self, mock_storage, mock_event):
+        mock_mwl = Mock(spec=MWLStorage)
+        mock_mwl.mark_in_progress.side_effect = Exception("db error")
+        subject = CStore(mock_storage, mwl_storage=mock_mwl)
+
+        assert subject.call(mock_event) == SUCCESS
+
     def test_validation_failure_accession_not_in_mwl(self, mock_storage, mock_event):
         """When accession is not in MWL, validation failure returns FAILURE without calling notify."""
         mock_validator = Mock(spec=DicomValidator)

tests/services/test_storage.py

@@ -322,9 +322,9 @@ def test_mark_in_progress(self, mwl_storage, result):
 
     def test_mark_in_progress_is_idempotent(self, mwl_storage, result):
         item = self._insert_item(mwl_storage, result)
-        mwl_storage.mark_in_progress(item.accession_number)  # now IN_PROGRESS
+        mwl_storage.update_status(item.accession_number, "IN PROGRESS")
 
-        assert mwl_storage.mark_in_progress(item.accession_number) is False  # no-op
+        assert mwl_storage.mark_in_progress(item.accession_number) is False
 
     def test_mark_in_progress_returns_false_when_not_found(self, mwl_storage):
         assert mwl_storage.mark_in_progress("DOES_NOT_EXIST") is False