Merge branch 'mar-23-update' into review_demog_test_flags

Public-Health-Scotland · Jan 24, 2024 · e6c83f0 · e6c83f0
2 parents d0fb3cd + cde4b3d
commit e6c83f0
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
@@ -48,7 +48,7 @@ jobs:
         shell: Rscript {0}
 
       - name: Cache styler
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.styler-location.outputs.location }}
           key: ${{ runner.os }}-styler-${{ github.sha }}

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-test-failures
           path: ${{ runner.temp }}/package
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -73,4 +73,4 @@ Encoding: UTF-8
 Language: en-GB
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.0
+RoxygenNote: 7.3.1
diff --git a/R/create_episode_file.R b/R/create_episode_file.R
@@ -103,6 +103,8 @@ create_episode_file <- function(
         "mar_beddays"
       )
     ) %>%
+    # match on sc client variables
+    join_sc_client(year, sc_client = sc_client, file_type = "episode") %>%
     # Check chi is valid using phsmethods function
     # If the CHI is invalid for whatever reason, set the CHI to NA
     dplyr::mutate(
@@ -135,7 +137,6 @@ create_episode_file <- function(
       year,
       slf_deaths_lookup
     ) %>%
-    join_sc_client(year, sc_client = sc_client, file_type = "episode") %>%
     load_ep_file_vars(year)
 
   if (!check_year_valid(year, type = c("ch", "hc", "at", "sds"))) {

diff --git a/man/calculate_stay.Rd b/man/calculate_stay.Rd
diff --git a/man/compute_mid_year_age.Rd b/man/compute_mid_year_age.Rd
diff --git a/man/convert_date_to_numeric.Rd b/man/convert_date_to_numeric.Rd
diff --git a/man/convert_numeric_to_date.Rd b/man/convert_numeric_to_date.Rd
diff --git a/man/end_fy.Rd b/man/end_fy.Rd
diff --git a/man/end_fy_quarter.Rd b/man/end_fy_quarter.Rd
diff --git a/man/end_next_fy_quarter.Rd b/man/end_next_fy_quarter.Rd
diff --git a/man/fy_interval.Rd b/man/fy_interval.Rd
diff --git a/man/is_date_in_fyyear.Rd b/man/is_date_in_fyyear.Rd
diff --git a/man/last_date_month.Rd b/man/last_date_month.Rd
diff --git a/man/midpoint_fy.Rd b/man/midpoint_fy.Rd
diff --git a/man/next_fy.Rd b/man/next_fy.Rd
diff --git a/man/start_fy.Rd b/man/start_fy.Rd
diff --git a/man/start_fy_quarter.Rd b/man/start_fy_quarter.Rd
diff --git a/man/start_next_fy_quarter.Rd b/man/start_next_fy_quarter.Rd