From 2e1fb9c1028bce2977a6dc86618822edd7537da3 Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Tue, 14 Jun 2022 13:53:18 -0400 Subject: [PATCH] run pre-commit --- .../routes/process_api_blueprint.py | 5 +- src/spiffworkflow_backend/scripts/script.py | 2 + .../services/process_instance_service.py | 4 +- .../integration/test_process_api.py | 50 +++++++++---------- 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/spiffworkflow_backend/routes/process_api_blueprint.py b/src/spiffworkflow_backend/routes/process_api_blueprint.py index 5c3cd6a0..a60d957b 100644 --- a/src/spiffworkflow_backend/routes/process_api_blueprint.py +++ b/src/spiffworkflow_backend/routes/process_api_blueprint.py @@ -106,7 +106,9 @@ def process_model_update(process_group_id, process_model_id, body): def process_model_show(process_group_id, process_model_id): """Process_model_show.""" - process_model = ProcessModelService().get_process_model(process_model_id, process_group_id) + process_model = ProcessModelService().get_process_model( + process_model_id, process_group_id + ) if process_model is None: raise ( ApiError( @@ -123,6 +125,7 @@ def process_model_show(process_group_id, process_model_id): def process_model_list(process_group_id, page=1, per_page=100): + """Process model list!""" ... diff --git a/src/spiffworkflow_backend/scripts/script.py b/src/spiffworkflow_backend/scripts/script.py index a47395db..113516bc 100644 --- a/src/spiffworkflow_backend/scripts/script.py +++ b/src/spiffworkflow_backend/scripts/script.py @@ -49,6 +49,7 @@ class Script: We may be able to remove the task for each of these calls if we are not using it other than potentially updating the task data. """ + def make_closure(subclass, task, workflow_id): """Yes - this is black magic. @@ -84,6 +85,7 @@ class Script: We may be able to remove the task for each of these calls if we are not using it other than potentially updating the task data. """ + def make_closure_validate(subclass, task, workflow_id): """Make_closure_validate.""" instance = subclass() diff --git a/src/spiffworkflow_backend/services/process_instance_service.py b/src/spiffworkflow_backend/services/process_instance_service.py index 8f2add86..04e78cf7 100644 --- a/src/spiffworkflow_backend/services/process_instance_service.py +++ b/src/spiffworkflow_backend/services/process_instance_service.py @@ -52,7 +52,9 @@ class ProcessInstanceService: navigation = processor.bpmn_process_instance.get_deep_nav_list() # ProcessInstanceService.update_navigation(navigation, processor) process_model_service = ProcessModelService() - process_model = process_model_service.get_process_model(processor.process_model_identifier) + process_model = process_model_service.get_process_model( + processor.process_model_identifier + ) process_instance_api = ProcessInstanceApi( id=processor.get_process_instance_id(), status=processor.get_status(), diff --git a/tests/spiffworkflow_backend/integration/test_process_api.py b/tests/spiffworkflow_backend/integration/test_process_api.py index f57e8a68..756a6a16 100644 --- a/tests/spiffworkflow_backend/integration/test_process_api.py +++ b/tests/spiffworkflow_backend/integration/test_process_api.py @@ -39,9 +39,7 @@ def with_bpmn_file_cleanup() -> Iterator[None]: # phase 1: req_id: 7.1 Deploy process def test_process_model_add( - app: Flask, - client: FlaskClient, - with_bpmn_file_cleanup: None + app: Flask, client: FlaskClient, with_bpmn_file_cleanup: None ) -> None: """Test_add_new_process_model.""" # group_id = None, @@ -49,11 +47,13 @@ def test_process_model_add( model_display_name = "Cooooookies" model_description = "Om nom nom delicious cookies" create_process_model( - app, client, + app, + client, process_group_id=None, process_model_id=model_id, process_model_display_name=model_display_name, - process_model_description=model_description) + process_model_description=model_description, + ) process_model = ProcessModelService().get_process_model(model_id) assert model_display_name == process_model.display_name assert 0 == process_model.display_order @@ -146,7 +146,7 @@ def test_process_model_update( def test_process_model_list( - app: Flask, client: FlaskClient, with_bpmn_file_cleanup: None + app: Flask, client: FlaskClient, with_bpmn_file_cleanup: None ) -> None: ... @@ -229,7 +229,7 @@ def test_process_group_update( def test_process_group_list( - app: Flask, client: FlaskClient, with_bpmn_file_cleanup: None + app: Flask, client: FlaskClient, with_bpmn_file_cleanup: None ) -> None: """Test_process_group_list.""" # add 5 groups @@ -242,46 +242,46 @@ def test_process_group_list( # get all groups response = client.get( - f"/v1.0/process-groups", + "/v1.0/process-groups", headers=logged_in_headers(user), ) assert len(response.json) == 5 # get first page, one per page response = client.get( - f"/v1.0/process-groups?page=1&per_page=1", + "/v1.0/process-groups?page=1&per_page=1", headers=logged_in_headers(user), ) assert len(response.json) == 1 - assert response.json[0]['id'] == 'test_process_group_0' + assert response.json[0]["id"] == "test_process_group_0" # get second page, one per page response = client.get( - f"/v1.0/process-groups?page=2&per_page=1", + "/v1.0/process-groups?page=2&per_page=1", headers=logged_in_headers(user), ) assert len(response.json) == 1 - assert response.json[0]['id'] == 'test_process_group_1' + assert response.json[0]["id"] == "test_process_group_1" # get first page, 3 per page response = client.get( - f"/v1.0/process-groups?page=1&per_page=3", + "/v1.0/process-groups?page=1&per_page=3", headers=logged_in_headers(user), ) assert len(response.json) == 3 - assert response.json[0]['id'] == 'test_process_group_0' - assert response.json[1]['id'] == 'test_process_group_1' - assert response.json[2]['id'] == 'test_process_group_2' + assert response.json[0]["id"] == "test_process_group_0" + assert response.json[1]["id"] == "test_process_group_1" + assert response.json[2]["id"] == "test_process_group_2" # get second page, 3 per page response = client.get( - f"/v1.0/process-groups?page=2&per_page=3", + "/v1.0/process-groups?page=2&per_page=3", headers=logged_in_headers(user), ) # there should only be 2 left assert len(response.json) == 2 - assert response.json[0]['id'] == 'test_process_group_3' - assert response.json[1]['id'] == 'test_process_group_4' + assert response.json[0]["id"] == "test_process_group_3" + assert response.json[1]["id"] == "test_process_group_4" def test_process_model_file_update_fails_if_no_file_given( @@ -585,12 +585,12 @@ def create_process_instance( def create_process_model( - app: Flask, - client: FlaskClient, - process_group_id=None, - process_model_id: str = None, - process_model_display_name: str = None, - process_model_description: str = None + app: Flask, + client: FlaskClient, + process_group_id=None, + process_model_id: str = None, + process_model_display_name: str = None, + process_model_description: str = None, ) -> TestResponse: """Create_process_model.""" process_model_service = ProcessModelService()