From 08050b038ae7adbff9506f1fc15e5b243ebcaf96 Mon Sep 17 00:00:00 2001 From: jasquat Date: Wed, 28 Dec 2022 14:37:04 -0500 Subject: [PATCH] save the process instance even if it fails to run all the way w/ burnettk --- .../routes/process_api_blueprint.py | 3 +- .../error/script_error_with_task_data.bpmn | 86 +++++++++++++++++++ .../integration/test_process_api.py | 28 ++++++ 3 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 spiffworkflow-backend/tests/data/error/script_error_with_task_data.bpmn diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py index ae784ba0b..c711df4fe 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py @@ -584,7 +584,7 @@ def process_instance_run( if do_engine_steps: try: - processor.do_engine_steps() + processor.do_engine_steps(save=True) except ApiError as e: ErrorHandlingService().handle_error(processor, e) raise e @@ -597,7 +597,6 @@ def process_instance_run( status_code=400, task=task, ) from e - processor.save() if not current_app.config["RUN_BACKGROUND_SCHEDULER"]: MessageService.process_message_instances() diff --git a/spiffworkflow-backend/tests/data/error/script_error_with_task_data.bpmn b/spiffworkflow-backend/tests/data/error/script_error_with_task_data.bpmn new file mode 100644 index 000000000..cd5f58aa4 --- /dev/null +++ b/spiffworkflow-backend/tests/data/error/script_error_with_task_data.bpmn @@ -0,0 +1,86 @@ + + + + + Flow_10jwwqy + + + + Flow_1axnzv6 + + + + + + { + "current_user": { + "id": "2", + "username": "ciadmin1" + }, + "num": 0 +} + { + "Mike": "Awesome", + "i": 2, + "current_user": { + "id": "2", + "username": "ciadmin1" + }, + "num": 0, + "my_var": "whatwhat", + "person": "Kevin" +} + + + {} + {} + + + {"current_user": {"id": "1", "username": "kb"}} + {"Mike": "Awesome", "current_user": {"id": "1", "username": "kb"}, "heyhey": "https://demo.spiffworkflow.org", "i": 2, "members": [], "my_var": "whatwhat", "person": "Kevin"} + + + + Flow_10jwwqy + Flow_1utkzvj + my_var = 'THE VAR' + + + + + Flow_1utkzvj + Flow_1axnzv6 + hey + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py index 273f6151f..66b6fa672 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py @@ -1,5 +1,6 @@ """Test Process Api Blueprint.""" import io +from flask_bpmn.api.api_error import ApiError import json import os import time @@ -2041,6 +2042,33 @@ class TestProcessApi(BaseTest): assert process is not None assert process.status == "error" + def test_task_data_is_set_even_if_process_instance_errors( + self, + app: Flask, + client: FlaskClient, + with_db_and_bpmn_file_cleanup: None, + with_super_admin_user: UserModel, + ) -> None: + process_model = load_test_spec( + process_model_id="group/error_with_task_data", + bpmn_file_name="script_error_with_task_data.bpmn", + process_model_source_directory="error", + ) + process_instance = self.create_process_instance_from_process_model( + process_model=process_model, user=with_super_admin_user + ) + + response = client.post( + f"/v1.0/process-instances/{self.modify_process_identifier_for_path_param(process_model.id)}/{process_instance.id}/run", + headers=self.logged_in_headers(with_super_admin_user), + ) + assert response.status_code == 400 + assert process_instance.status == 'error' + processor = ProcessInstanceProcessor(process_instance) + spiff_task = processor.get_task_by_bpmn_identifier('script_task_one', processor.bpmn_process_instance) + assert spiff_task is not None + assert spiff_task.data != {} + def test_process_model_file_create( self, app: Flask,