updates code and tests so that "theme" is presented in the custom sce…

…nario table instead of domain
nhs-bnssg-analytics · Jul 22, 2024 · 9faaed1 · 9faaed1
1 parent 1e0d389
commit 9faaed1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/R/fct_scenario_inputs.R b/R/fct_scenario_inputs.R
@@ -40,7 +40,7 @@ scenario_inputs <- function(ics_code, horizon, scenario,
     domain_type = c("Demand", "Capacity")
   ) |>
     select(
-      "domain", "metric", "year", "value"
+      "theme", "metric", "year", "value"
     )
 
   end_year_range <- historic_data |>
@@ -64,7 +64,7 @@ scenario_inputs <- function(ics_code, horizon, scenario,
       tidyr::complete(
         tidyr::nesting(
           !!sym("metric"),
-          !!sym("domain")
+          !!sym("theme")
         ),
         year = seq(
           from = earliest_end_year,
@@ -74,7 +74,7 @@ scenario_inputs <- function(ics_code, horizon, scenario,
       ) |>
       dplyr::group_by(
         !!sym("metric"),
-        !!sym("domain")) |>
+        !!sym("theme")) |>
       tidyr::fill(
         !!sym("value"),
         .direction = "down"
@@ -91,7 +91,7 @@ scenario_inputs <- function(ics_code, horizon, scenario,
       tidyr::complete(
         tidyr::nesting(
           !!sym("metric"),
-          !!sym("domain")
+          !!sym("theme")
         ),
         year = seq(
           from = earliest_end_year,
@@ -101,7 +101,7 @@ scenario_inputs <- function(ics_code, horizon, scenario,
       ) |>
       dplyr::group_by(
         !!sym("metric"),
-        !!sym("domain")) |>
+        !!sym("theme")) |>
       mutate(
         index = cumsum(is.na(!!sym("value")))
       ) |>
@@ -121,12 +121,12 @@ scenario_inputs <- function(ics_code, horizon, scenario,
         !!sym("year") >= max(!!sym("year")) - (linear_years - 1),
         .by = c(
           !!sym("metric"),
-          !!sym("domain")
+          !!sym("theme")
         )
       ) |>
       group_by(
         !!sym("metric"),
-        !!sym("domain")
+        !!sym("theme")
       ) |>
       tidyr::complete(
         year = seq(
@@ -173,7 +173,7 @@ scenario_inputs <- function(ics_code, horizon, scenario,
   wide_metric_data <- long_metric_data |>
     ungroup() |>
     arrange(
-      !!sym("domain"),
+      !!sym("theme"),
       !!sym("metric"),
       !!sym("year")
     ) |>
@@ -387,7 +387,7 @@ update_observed_time_period_predictions <- function(model_outputs, r) {
     ics_code = r$ics_cd
   ) |>
     dplyr::select(
-      !c("domain", "numerator", "denominator", "value_type")
+      !c("domain", "theme", "numerator", "denominator", "value_type")
     )
 
   # make wide and create lag versions
@@ -560,7 +560,7 @@ check_scenario_inputs <- function(inputs, historic_data) {
       .by = !!sym("metric")
     )
 
-  reference_metrics <- c("metric", "domain", "min_val", "max_val")
+  reference_metrics <- c("metric", "theme", "min_val", "max_val")
 
   inputs <- inputs |>
     left_join(

diff --git a/R/fct_scenario_modelling.R b/R/fct_scenario_modelling.R
@@ -45,7 +45,7 @@ model_scenario_data <- function(scenario_data, ics_code, model) {
     mutate(
       org = ics_code
     ) |>
-    select(!c("domain")) |>
+    select(!c("theme")) |>
     tidyr::pivot_longer(
       cols = !c("metric", "org"),
       names_to = "year",

diff --git a/R/mod_02_scenario_planner.R b/R/mod_02_scenario_planner.R
@@ -440,7 +440,7 @@ mod_02_scenario_planner_server <- function(id, r){
 
       numeric_cols <- setdiff(
         names(r$scenario_data$custom),
-        c("metric", "domain")
+        c("metric", "domain", "theme")
       )
 
       DT::datatable(
@@ -454,14 +454,14 @@ mod_02_scenario_planner_server <- function(id, r){
                     names(r$scenario_data$custom)
                   ) - 2
               )
-            ), # disable editing metric and domain fields and previous year values
+            ), # disable editing metric and theme fields and previous year values
           numeric = "all" # allow only numeric values
         ),
         extensions = "Buttons",
         selection = "none", # don't need to be able to select rows
         colnames = c(
           "Metric" = "metric",
-          "Domain" = "domain"
+          "Theme" = "theme"
         ),
         options = list(
           paging = TRUE,

diff --git a/tests/testthat/test-fct_data_loading.R b/tests/testthat/test-fct_data_loading.R
@@ -4,7 +4,7 @@ test_that("dimensions of ics_data function", {
   )
   expect_equal(
     names(bnssg_data),
-    c("year", "org", "domain", "metric", "numerator",
+    c("year", "org", "domain", "theme", "metric", "numerator",
       "denominator", "value", "value_type"),
     label = "all field names are as expected"
   )

diff --git a/tests/testthat/test-fct_scenario_inputs.R b/tests/testthat/test-fct_scenario_inputs.R
@@ -32,8 +32,8 @@ test_that("data dimensions last_known_year ", {
   )
   expect_equal(
     names(df)[1:2],
-    c("metric", "domain"),
-    info = "metric and domain are first 2 column names for scenario_inputs() 'last_known_year'"
+    c("metric", "theme"),
+    info = "metric and theme are first 2 column names for scenario_inputs() 'last_known_year'"
   )
   expect_equal(
     df |> dplyr::count(metric) |> filter(n > 1) |> nrow(),
@@ -56,8 +56,8 @@ test_that("data dimensions percent_change ", {
   )
   expect_equal(
     names(df)[1:2],
-    c("metric", "domain"),
-    info = "metric and domain are first 2 column names for scenario_inputs() 'percent_change'"
+    c("metric", "theme"),
+    info = "metric and theme are first 2 column names for scenario_inputs() 'percent_change'"
   )
   expect_equal(
     df |> dplyr::count(metric) |> filter(n > 1) |> nrow(),
@@ -80,8 +80,8 @@ test_that("data dimensions linear ", {
   )
   expect_equal(
     names(df)[1:2],
-    c("metric", "domain"),
-    info = "metric and domain are first 2 column names for scenario_inputs() 'linear'"
+    c("metric", "theme"),
+    info = "metric and theme are first 2 column names for scenario_inputs() 'linear'"
   )
   expect_equal(
     df |> dplyr::count(metric) |> filter(n > 1) |> nrow(),
@@ -139,8 +139,8 @@ test_that("reset_scenarios works as expected", {
       ) |>
       unlist() |>
       unique(),
-    c("metric", "domain"),
-    info = "metric and domain are the character fields in the reset_scenarios function"
+    c("metric", "theme"),
+    info = "metric and theme are the character fields in the reset_scenarios function"
   )
 
 })
@@ -197,7 +197,7 @@ test_that("the scenario data checker function ensures all values that are not re
 
   inputs <- tibble(
     metric = dummy_metrics,
-    domain = c("Capacity", "Performance", "Demand", "Capacity", "Demand")
+    theme = c("Capacity", "Performance", "Demand", "Capacity", "Demand")
   ) |>
     cross_join(
       tibble(
@@ -224,7 +224,7 @@ test_that("the scenario data checker function ensures all values that are not re
 
   historic_data <- inputs |>
     distinct(
-      metric, domain
+      metric, theme
     ) |>
     cross_join(
       tibble(

diff --git a/tests/testthat/test-fct_scenario_modelling.R b/tests/testthat/test-fct_scenario_modelling.R
@@ -139,7 +139,7 @@ test_that("end to end modelling function works", {
       outputs$year,
       inputs |>
         pivot_longer(
-          cols = !c("metric", "domain"),
+          cols = !c("metric", "theme"),
           names_to = "year",
           values_to = "value"
         ) |>