WS-858: address issues found in MR 718

services/capability/capability/views/capability_request.py

@@ -138,12 +138,11 @@ def create_follow_on_capability_request(request: Request) -> Response:
     followon_type = request.matchdict["followon_type"]
     request_id = request.matchdict["request_id"]
     capability_info = request.capability_info
-    capability_request = capability_info.lookup_capability_request(request_id)
 
-    current_version = capability_request.current_version
+    version_number = int(request.matchdict["version"])
+    current_version = capability_info.lookup_version(request_id, version_number)
     parameters = current_version.parameters
     user_email = parameters["user_email"]
-    version_number = request.matchdict["version"]
 
     previous_workflow_id = current_version.current_execution.current_workflow_request_id
     metadata_content = request.workflow_service.retrieve_file_content(
@@ -158,7 +157,6 @@ def create_follow_on_capability_request(request: Request) -> Response:
         parameters={
             "user_email": user_email,
             "version": version_number,
-            "previous_workflow_request_id": previous_workflow_id,
             "sdm_id": sdm_id,
             "cms_path": cms_path,
         },

shared/workspaces/workspaces/workflow/services/workflow_service.py

@@ -700,7 +700,7 @@ class WorkflowMessageHandler:
         subject = message["subject"]
         wf_req_id = subject["workflow_request_id"]
         wf_request = self.info.lookup_workflow_request(wf_req_id)
-        subject["execution_wf_id"] = wf_request.argument["previous_workflow_request_id"]
+        subject["execution_wf_id"] = wf_request.argument["parent_wf_request_id"]
 
         if "ingest" in wf_request.workflow_name:
             logger.info("SENDING INGESTION FAILED MESSAGE!")