Fail for no accession number when creating items

Author: steventux

src/services/mwl/create_worklist_item.py

@@ -12,14 +12,10 @@ def __init__(self, storage: MWLStorage):
 
     def call(self, payload: dict):
         try:
-            action_id = payload.get("action_id")
-            if not action_id:
-                raise ValueError("Missing action_id in payload")
-
+            action_id = payload["action_id"]
             params = payload.get("parameters", {})
-
             item = params.get("worklist_item", {})
-            accession_number = item.get("accession_number")
+            accession_number = item["accession_number"]
             participant = item.get("participant", {})
             scheduled = item.get("scheduled", {})
             procedure = item.get("procedure", {})
@@ -43,6 +39,9 @@ def call(self, payload: dict):
         except WorklistItemExistsError:
             logger.info(f"Worklist item exists: accession_number={accession_number}, action_id={action_id!r}")
             return {"status": "exists", "action_id": action_id}
+        except KeyError as e:
+            logger.error(f"Missing key in payload: {e}")
+            return {"status": "error", "message": f"Missing key: {e}"}
         except Exception as e:
             logger.error(f"Failed to create worklist item: {e}")
-            return {"status": "error", "action_id": action_id, "error": str(e)}
+            return {"status": "error", "message": str(e)}

tests/services/mwl/test_create_worklist_item.py

@@ -12,7 +12,7 @@ def db_file(tmp_path):
         return f"{tmp_path}/test.db"
 
     @pytest.fixture
-    def mwl_storage(db_file):
+    def mwl_storage(self, db_file):
         return MWLStorage(str(db_file))
 
     def test_call_success(self, mwl_storage, listener_payload):
@@ -28,7 +28,16 @@ def test_call_missing_action_id(self, mwl_storage, listener_payload):
 
         response = subject.call(listener_payload)
         assert response["status"] == "error"
-        assert "Missing action_id" in response["error"]
+        assert response["message"] == "Missing key: 'action_id'"
+
+    def test_call_missing_accession_number(self, mwl_storage, listener_payload):
+        subject = CreateWorklistItem(mwl_storage)
+
+        del listener_payload["parameters"]["worklist_item"]["accession_number"]
+
+        response = subject.call(listener_payload)
+        assert response["status"] == "error"
+        assert response["message"] == "Missing key: 'accession_number'"
 
     def test_call_existing_worklist_item(self, mwl_storage, listener_payload):
         CreateWorklistItem(mwl_storage).call(listener_payload)
@@ -44,4 +53,4 @@ def test_call_storage_exception(self, _, mwl_storage, listener_payload):
 
         response = subject.call(listener_payload)
         assert response["status"] == "error"
-        assert "DB error" in response["error"]
+        assert "DB error" in response["message"]