From 38fb94b84453fae97b89b2092cb361fa69c5d547 Mon Sep 17 00:00:00 2001
From: jbirddog <100367399+jbirddog@users.noreply.github.com>
Date: Thu, 15 Dec 2022 09:31:19 -0500
Subject: [PATCH] Fix endpoints for script task unit tests (#77)

---
 .../src/spiffworkflow_backend/api.yml         | 20 ++++---------------
 .../routes/process_api_blueprint.py           |  6 +++---
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/api.yml b/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
index 84ada234..c559ba98 100755
--- a/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
@@ -610,15 +610,9 @@ paths:
                 items:
                   $ref: "#/components/schemas/Workflow"
 
-  /process-models/{process_group_id}/{process_model_id}/script-unit-tests:
+  /process-models/{modified_process_model_identifier}/script-unit-tests:
     parameters:
-      - name: process_group_id
-        in: path
-        required: true
-        description: The unique id of an existing process group
-        schema:
-          type: string
-      - name: process_model_id
+      - name: modified_process_model_identifier
         in: path
         required: true
         description: The unique id of an existing process model.
@@ -637,15 +631,9 @@ paths:
               schema:
                 $ref: "#/components/schemas/Workflow"
 
-  /process-models/{process_group_id}/{process_model_id}/script-unit-tests/run:
+  /process-models/{modified_process_model_identifier}/script-unit-tests/run:
     parameters:
-      - name: process_group_id
-        in: path
-        required: true
-        description: The unique id of an existing process group
-        schema:
-          type: string
-      - name: process_model_id
+      - name: modified_process_model_identifier
         in: path
         required: true
         description: The unique id of an existing process model.
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 74e5a7e7..9a616836 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py
@@ -1613,7 +1613,7 @@ def task_submit(
 
 
 def script_unit_test_create(
-    process_group_id: str, process_model_id: str, body: Dict[str, Union[str, bool, int]]
+    modified_process_model_identifier: str, body: Dict[str, Union[str, bool, int]]
 ) -> flask.wrappers.Response:
     """Script_unit_test_create."""
     bpmn_task_identifier = _get_required_parameter_or_raise(
@@ -1624,7 +1624,7 @@ def script_unit_test_create(
         "expected_output_json", body
     )
 
-    process_model_identifier = f"{process_group_id}/{process_model_id}"
+    process_model_identifier = modified_process_model_identifier.replace(":", "/")
     process_model = get_process_model(process_model_identifier)
     file = SpecFileService.get_files(process_model, process_model.primary_file_name)[0]
     if file is None:
@@ -1702,7 +1702,7 @@ def script_unit_test_create(
 
 
 def script_unit_test_run(
-    process_group_id: str, process_model_id: str, body: Dict[str, Union[str, bool, int]]
+    modified_process_model_identifier: str, body: Dict[str, Union[str, bool, int]]
 ) -> flask.wrappers.Response:
     """Script_unit_test_run."""
     # FIXME: We should probably clear this somewhere else but this works