Merge pull request #663 from The-Strategy-Unit/fix_results_url

fixes results url

Author: matt-dray

R/mod_run_model_api_calls.R

@@ -54,7 +54,8 @@ mod_run_model_submit <- function(
         }
 
         url <- glue::glue(
-          "{Sys.getenv('NHP_OUTPUTS_URI')}?{results$dataset}/{results$model_run_id}"
+          Sys.getenv("NHP_OUTPUTS_URI"),
+          "?{results$dataset}/{results$model_run_id}"
         )
         cat("results url: ", url, "\n", sep = "")
         results_url(url)
@@ -109,19 +110,21 @@ mod_run_model_check_container_status <- function(
       \(response) {
         res <- httr2::resp_body_json(response)
 
-        if (res$state == "Terminated") {
-          if (res$detail_status == "Completed") {
+        state <- res$state %||% "unknown"
+        if (state == "Terminated") {
+          if ((res$detail_status %||% "Completed") == "Completed") {
             cat("model run success: ", id, "\n", sep = "")
             status("Success")
           } else {
             cat("model run error: ", id, "\n", res$error, "\n", sep = "")
             status(glue::glue("Error running the model ({id}): {res$error}"))
           }
           return(NULL)
-        } else if (res$state == "Creating") {
+        } else if (state %in% c("Creating", "unknown")) {
           # no need to change status
         } else {
-          progress <- res$complete
+          progress <- res$complete %||%
+            list(Inpatients = 0, Outpatients = 0, AaE = 0)
           model_runs <- res$model_runs
 
           if (is.null(progress)) {