getSubmissionStatus uses workflow cost when actual cost is not populated

broadinstitute · Jan 24, 2025 · aeeb914 · aeeb914
1 parent 874eda6
commit aeeb914
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionsService.scala b/core/src/main/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionsService.scala
@@ -457,8 +457,12 @@ class SubmissionsService(
             case Success(costMap) =>
               val costedWorkflows = submission.workflows.map { workflow =>
                 workflow.workflowId match {
-                  case Some(wfId) => workflow.copy(cost = costMap.get(wfId))
-                  case None       => workflow
+                  case Some(wfId) =>
+                    // prefer the actual cost from the cost map;
+                    // use Cromwell-estimated cost from the workflow if not
+                    val calculatedCost = costMap.get(wfId).orElse(workflow.cost)
+                    workflow.copy(cost = calculatedCost)
+                  case None => workflow
                 }
               }
               val costedSubmission = submission.copy(cost = Some(costMap.values.sum), workflows = costedWorkflows)