refacor: cleanup data targets

Author: dshemetov

covid_hosp_explore/data_targets.R

@@ -1,33 +1,75 @@
+geo_type <- "state"
+time_type <- "day"
+geo_values <- "*"
+time_values <- epidatr::epirange(from = "2020-01-01", to = "2024-01-01")
+fetch_args <- fetch_args_list(return_empty = TRUE, timeout_seconds = 200)
+issues <- "*"
+
 data_targets <- list(
   tar_target(
-    name = hhs_evaluation_data,
+    name = hhs_latest_data,
     command = {
       epidatr::pub_covidcast(
         source = "hhs",
         signals = "confirmed_admissions_covid_1d",
-        geo_type = "state",
-        time_type = "day",
-        geo_values = "*",
-        time_values = epidatr::epirange(from = "20200101", to = "20240101"),
-      ) %>%
+        geo_type = geo_type,
+        time_type = time_type,
+        geo_values = geo_values,
+        time_values = time_values,
+        fetch_args = fetch_args
+      )
+    }
+  ),
+  tar_target(
+    name = chng_latest_data,
+    command = {
+      epidatr::pub_covidcast(
+        source = "chng",
+        signals = "smoothed_adj_outpatient_covid",
+        geo_type = geo_type,
+        time_type = time_type,
+        geo_values = geo_values,
+        time_values = time_values,
+        fetch_args = fetch_args
+      )
+    }
+  ),
+  tar_target(
+    name = hhs_evaluation_data,
+    command = {
+      hhs_latest_data %>%
         rename(
           actual = value,
           target_end_date = time_value
         )
     }
   ),
+  tar_target(
+    name = hhs_latest_data_2022,
+    command = {
+      hhs_latest_data %>%
+        filter(time_value >= "2022-01-01")
+    }
+  ),
+  tar_target(
+    name = chng_latest_data_2022,
+    command = {
+      chng_latest_data %>%
+        filter(time_value >= "2022-01-01")
+    }
+  ),
   tar_target(
     name = hhs_archive_data_2022,
     command = {
       epidatr::pub_covidcast(
         source = "hhs",
         signals = "confirmed_admissions_covid_1d",
-        geo_type = "state",
-        time_type = "day",
-        geo_values = "*",
-        time_values = epidatr::epirange(from = "20220101", to = "20220401"),
+        geo_type = geo_type,
+        time_type = time_type,
+        geo_values = geo_values,
+        time_values = time_values,
         issues = "*",
-        fetch_args = fetch_args_list(return_empty = TRUE, timeout_seconds = 100)
+        fetch_args = fetch_args
       )
     }
   ),
@@ -37,12 +79,12 @@ data_targets <- list(
       epidatr::pub_covidcast(
         source = "chng",
         signals = "smoothed_adj_outpatient_covid",
-        geo_type = "state",
-        time_type = "day",
-        geo_values = "*",
-        time_values = epidatr::epirange(from = "20220101", to = "20220401"),
+        geo_type = geo_type,
+        time_type = time_type,
+        geo_values = geo_values,
+        time_values = time_values,
         issues = "*",
-        fetch_args = fetch_args_list(return_empty = TRUE, timeout_seconds = 100)
+        fetch_args = fetch_args
       )
     }
   ),
@@ -69,34 +111,5 @@ data_targets <- list(
         )
       epix_merge(hhs_archive_data_2022, chng_archive_data_2022, sync = "locf")
     }
-  ),
-  tar_target(
-    # TODO: This is almost identical to hhs_evaluation_data. Can we combine them?
-    name = hhs_latest_data_2022,
-    command = {
-      epidatr::pub_covidcast(
-        source = "hhs",
-        signals = "confirmed_admissions_covid_1d",
-        geo_type = "state",
-        time_type = "day",
-        geo_values = "*",
-        time_values = epidatr::epirange(from = "20220101", to = "20220401"),
-        fetch_args = fetch_args_list(return_empty = TRUE, timeout_seconds = 100)
-      )
-    }
-  ),
-  tar_target(
-    name = chng_latest_data_2022,
-    command = {
-      epidatr::pub_covidcast(
-        source = "chng",
-        signals = "smoothed_adj_outpatient_covid",
-        geo_type = "state",
-        time_type = "day",
-        geo_values = "*",
-        time_values = epidatr::epirange(from = "20220101", to = "20220401"),
-        fetch_args = fetch_args_list(return_empty = TRUE, timeout_seconds = 100)
-      )
-    }
   )
 )