Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Imports:
hms (>= 1.1.0),
janitor (>= 2.2.0),
keyring (>= 1.3.0),
logger (>= 0.4.1),
lubridate (>= 1.9.2),
magrittr (>= 2.0.3),
odbc (>= 1.3.1),
Expand Down
7 changes: 7 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ export(is_missing)
export(last_date_month)
export(latest_cost_year)
export(latest_update)
export(log_ep_message)
export(log_ep_substage)
export(log_ind_message)
export(log_ind_substage)
export(log_slf_event)
export(log_tar_message)
export(make_lowercase_ext)
export(midpoint_fy)
export(next_fy)
Expand Down Expand Up @@ -198,6 +204,7 @@ export(setup_keyring)
export(start_fy)
export(start_fy_quarter)
export(start_next_fy_quarter)
export(write_console_output)
export(write_file)
export(write_temp_data)
export(years_to_run)
Expand Down
20 changes: 11 additions & 9 deletions R/create_episode_file.R
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ create_episode_file <- function(
write_to_disk = TRUE,
write_temp_to_disk = FALSE
) {
cli::cli_alert_info("Create episode file function started at {Sys.time()}")
log_ep_substage("Create episode file", "started", year)

processed_data_list <- purrr::discard(processed_data_list, ~ is.null(.x) | identical(.x, tibble::tibble()))

Expand Down Expand Up @@ -317,7 +317,7 @@ store_ep_file_vars <- function(data, year, vars_to_keep) {
group_id = 3356 # sourcedev owner
)

cli::cli_alert_info("Store episode file variables function finished at {Sys.time()}")
log_ep_substage("Store episode file variables", "finished", year)

return(
dplyr::select(
Expand Down Expand Up @@ -352,7 +352,7 @@ load_ep_file_vars <- function(data, year) {

fs::file_delete(tempfile_path)

cli::cli_alert_info("Load episode file variable function finished at {Sys.time()}")
log_ep_substage("Load episode file variables", "finished", year)

return(full_data)
}
Expand Down Expand Up @@ -409,7 +409,7 @@ fill_missing_cij_markers <- function(data) {

return_data <- dplyr::bind_rows(non_fixable_data, fixed_data)

cli::cli_alert_info("Fill missing cij markers function finished at {Sys.time()}")
log_ep_substage("Fill missing cij markers", "finished", year)

return(return_data)
}
Expand Down Expand Up @@ -455,7 +455,7 @@ correct_cij_vars <- function(data) {
)
)

cli::cli_alert_info("Correct cij variables function finished at {Sys.time()}")
log_ep_substage("Correct cij variables", "finished", year)

return(data)
}
Expand Down Expand Up @@ -483,7 +483,7 @@ create_cost_inc_dna <- function(data) {
)
)

cli::cli_alert_info("Create cost inc dna function finished at {Sys.time()}")
log_ep_substage("Create cost inc dna", "finished", year)

return(data)
}
Expand All @@ -510,7 +510,7 @@ create_cohort_lookups <- function(data, year, update = latest_update()) {
write_to_disk = TRUE
)

cli::cli_alert_info("Create cohort lookups function finished at {Sys.time()}")
log_ep_substage("Create cohort lookups", "finished", year)

return(data)
}
Expand Down Expand Up @@ -545,7 +545,7 @@ join_cohort_lookups <- function(
by = "anon_chi"
)

cli::cli_alert_info("Join cohort lookups function finished at {Sys.time()}")
log_ep_substage("Join cohort lookups", "finished", year)

return(join_cohort_lookups)
}
Expand Down Expand Up @@ -612,7 +612,9 @@ join_sc_client <- function(data,
)
}

cli::cli_alert_info("Join social care client function finished at {Sys.time()}")
log_ep_substage("Join social care client", "finished", year)

log_ep_substage("Create episode file", "finished", year)

return(data_file)
}
62 changes: 32 additions & 30 deletions R/create_individual_file.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ create_individual_file <- function(
write_to_disk = TRUE,
write_temp_to_disk
) {
cli::cli_alert_info("Create individual file function started at {Sys.time()}")
log_ind_substage("Create individual file", "started", year)

individual_file <- episode_file %>%
dplyr::select(dplyr::any_of(c(
Expand Down Expand Up @@ -177,7 +177,7 @@ remove_blank_chi <- function(episode_file) {
dplyr::mutate(anon_chi = dplyr::na_if(.data$anon_chi, "")) %>%
dplyr::filter(!is.na(.data$anon_chi))

cli::cli_alert_info("Remove blank CHI function finished at {Sys.time()}")
log_ind_substage("Remove blank CHI function", "finished", year)

return(episode_file)
}
Expand Down Expand Up @@ -218,7 +218,7 @@ add_cij_columns <- function(episode_file) {
)
)

cli::cli_alert_info("Add cij columns function finished at {Sys.time()}")
log_ind_substage("Add cij columns function", "finished", year)

return(episode_file)
}
Expand Down Expand Up @@ -276,7 +276,7 @@ add_all_columns <- function(episode_file, year) {
)
)

cli::cli_alert_info("Add all columns function finished at {Sys.time()}")
log_ind_substage("Add all columns function", "finished", year)

return(episode_file)
}
Expand All @@ -293,7 +293,7 @@ add_acute_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
add_ipdc_cols(prefix, condition)

cli::cli_alert_info("Add acute columns function finished at {Sys.time()}")
log_ind_substage("Add acute columns function", "finished", year)

return(episode_file)
}
Expand All @@ -308,7 +308,7 @@ add_mat_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
add_ipdc_cols(prefix, condition, elective = FALSE)

cli::cli_alert_info("Add maternity columns function finished at {Sys.time()}")
log_ind_substage("Add maternity columns function", "finished", year)

return(episode_file)
}
Expand All @@ -323,7 +323,7 @@ add_mh_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
add_ipdc_cols(prefix, condition, ipdc_d = FALSE)

cli::cli_alert_info("Add mental health columns function finished at {Sys.time()}")
log_ind_substage("Add mental health columns function", "finished", year)

return(episode_file)
}
Expand All @@ -338,7 +338,7 @@ add_gls_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
add_ipdc_cols(prefix, condition, ipdc_d = FALSE)

cli::cli_alert_info("Add geriatric long stay columns function finished at {Sys.time()}")
log_ind_substage("Add geriatric long stay columns function", "finished", year)

return(episode_file)
}
Expand All @@ -364,7 +364,7 @@ add_op_columns <- function(episode_file, prefix, condition) {
"{prefix}_cost_dnas" := dplyr::if_else(eval(condition_5_8), .data$cost_total_net_inc_dnas, NA_real_)
)

cli::cli_alert_info("Add outpatient columns function finished at {Sys.time()}")
log_ind_substage("Add outpatient columns function", "finished", year)

return(episode_file)
}
Expand All @@ -379,7 +379,7 @@ add_ae_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition, cost = TRUE) %>%
dplyr::mutate("{prefix}_attendances" := dplyr::if_else(eval(condition), 1L, NA_integer_))

cli::cli_alert_info("Add A&E columns function finished at {Sys.time()}")
log_ind_substage("Add A&E columns function", "finished", year)

return(episode_file)
}
Expand All @@ -393,7 +393,7 @@ add_pis_columns <- function(episode_file, prefix, condition) {
episode_file <- episode_file %>%
add_standard_cols(prefix, condition, cost = TRUE) %>%
dplyr::mutate("{prefix}_paid_items" := dplyr::if_else(eval(condition), .data$no_paid_items, NA_integer_))
cli::cli_alert_info("Add prescribing columns function finished at {Sys.time()}")
log_ind_substage("Add prescribing columns function", "finished", year)

return(episode_file)
}
Expand Down Expand Up @@ -430,7 +430,7 @@ add_ooh_columns <- function(episode_file, prefix, condition) {
)
)

cli::cli_alert_info("Add out of hours columns function finished at {Sys.time()}")
log_ind_substage("Add out of hours columns function", "finished", year)

return(episode_file)
}
Expand All @@ -457,7 +457,7 @@ add_dn_columns <- function(episode_file, prefix, condition) {
dplyr::mutate("{prefix}_contacts" := NA_integer_)
}

cli::cli_alert_info("Add district nursing columns function finished at {Sys.time()}")
log_ind_substage("Add district nursing columns function", "finished", year)

return(episode_file)
}
Expand All @@ -472,7 +472,7 @@ add_cmh_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition) %>%
dplyr::mutate("{prefix}_contacts" := dplyr::if_else(eval(condition), 1L, NA_integer_))

cli::cli_alert_info("Add communicty mental health columns function finished at {Sys.time()}")
log_ind_substage("Add community mental health columns function", "finished", year)

return(episode_file)
}
Expand All @@ -496,7 +496,7 @@ add_dd_columns <- function(episode_file, prefix, condition) {
"{prefix}_Code9_beddays" := dplyr::if_else(eval(condition_delay_9), .data$yearstay, NA_real_)
)

cli::cli_alert_info("Add delayed discharges columns function finished at {Sys.time()}")
log_ind_substage("Add delayed discharges columns function", "finished", year)

return(episode_file)
}
Expand All @@ -511,7 +511,7 @@ add_nsu_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition) %>%
dplyr::mutate("{prefix}" := dplyr::if_else(eval(condition), 1L, NA_integer_))

cli::cli_alert_info("Add non service users columns function finished at {Sys.time()}")
log_ind_substage("Add non service users columns function", "finished", year)

return(episode_file)
}
Expand All @@ -526,7 +526,7 @@ add_nrs_columns <- function(episode_file, prefix, condition) {
add_standard_cols(prefix, condition) %>%
dplyr::mutate("{prefix}" := dplyr::if_else(eval(condition), 1L, NA_integer_))

cli::cli_alert_info("Add nrs columns function finished at {Sys.time()}")
log_ind_substage("Add nrs columns function", "finished", year)

return(episode_file)
}
Expand All @@ -540,7 +540,7 @@ add_hl1_columns <- function(episode_file, prefix, condition) {
episode_file <- episode_file %>%
add_standard_cols(prefix, condition)

cli::cli_alert_info("Add homelessness columns function finished at {Sys.time()}")
log_ind_substage("Add homelessness columns function", "finished", year)

return(episode_file)
}
Expand Down Expand Up @@ -574,7 +574,7 @@ add_ch_columns <- function(episode_file, prefix, condition) {
)
)

cli::cli_alert_info("Add care home columns function finished at {Sys.time()}")
log_ind_substage("Add care home columns function", "finished", year)

return(episode_file)
}
Expand Down Expand Up @@ -622,7 +622,7 @@ add_hc_columns <- function(episode_file, prefix, condition) {
"{prefix}_reablement_hours_cost" := dplyr::if_else(eval(condition_reabl), .data$cost_total_net, NA_real_)
)

cli::cli_alert_info("Add home care columns function finished at {Sys.time()}")
log_ind_substage("Add home care columns function", "finished", year)

return(episode_file)
}
Expand All @@ -640,7 +640,7 @@ add_at_columns <- function(episode_file, prefix, condition) {
"{prefix}_telecare" := dplyr::if_else(eval(condition) & .data$smrtype == "AT-Tele", 1L, NA_integer_)
)

cli::cli_alert_info("Add alarms telecare columns function finished at {Sys.time()}")
log_ind_substage("Add alarms telecare columns function", "finished", year)

return(episode_file)
}
Expand All @@ -660,7 +660,7 @@ add_sds_columns <- function(episode_file, prefix, condition) {
"{prefix}_option_4" := dplyr::if_else(eval(condition) & .data$smrtype == "SDS-4", 1L, NA_integer_)
)

cli::cli_alert_info("Add SDS columns function finished at {Sys.time()}")
log_ind_substage("Add SDS columns function", "finished", year)

return(episode_file)
}
Expand Down Expand Up @@ -708,7 +708,7 @@ add_ipdc_cols <- function(episode_file, prefix, condition, ipdc_d = TRUE, electi
)
}

cli::cli_alert_info("Add ipdc columns function finished at {Sys.time()}")
log_ind_substage("Add ipdc columns function", "finished", year)

return(episode_file)
}
Expand All @@ -730,7 +730,7 @@ add_standard_cols <- function(episode_file, prefix, condition, episode = FALSE,
episode_file <- dplyr::mutate(episode_file, "{prefix}_cost" := dplyr::if_else(eval(condition), .data$cost_total_net, NA_real_))
}

cli::cli_alert_info("Add standard columns function finished at {Sys.time()}")
log_ind_substage("Add standard columns function", "finished", year)

return(episode_file)
}
Expand Down Expand Up @@ -775,7 +775,7 @@ clean_up_ch <- function(episode_file, year) {
) %>%
dplyr::select(-c("fy_end", "fy_start", "term_1", "term_2"))

cli::cli_alert_info("Clean up CH function finished at {Sys.time()}")
log_ind_substage("Clean up CH function", "finished", year)

return(episode_file)
}
Expand All @@ -796,7 +796,7 @@ recode_gender <- function(episode_file) {
)
)

cli::cli_alert_info("Recode Gender function finished at {Sys.time()}")
log_ind_substage("Recode Gender function", "finished", year)

return(episode_file)
}
Expand All @@ -812,7 +812,7 @@ condition_cols <- function() {
date_cols <- paste0(conditions, "_date")
all_cols <- c(conditions, date_cols)

cli::cli_alert_info("Return condition columns function finished at {Sys.time()}")
log_ind_substage("Return condition columns function", "finished", year)

return(all_cols)
}
Expand Down Expand Up @@ -858,7 +858,7 @@ clean_individual_file <- function(individual_file, year) {
clean_up_gender() %>%
dplyr::mutate(age = compute_mid_year_age(year, .data$dob))

cli::cli_alert_info("Clean individual file function finished at {Sys.time()}")
log_ind_substage("Clean individual file function", "finished", year)

return(individual_file)
}
Expand All @@ -881,7 +881,7 @@ clean_up_gender <- function(individual_file) {
# change back to anon_chi
slfhelper::get_anon_chi()

cli::cli_alert_info("Clean up gender column function finished at {Sys.time()}")
log_ind_substage("Clean up gender column function", "finished", year)
return(individual_file)
}

Expand Down Expand Up @@ -913,7 +913,9 @@ join_slf_lookup_vars <- function(individual_file,
) %>%
dplyr::rename(hbrescode = hbrescode_var)

cli::cli_alert_info("Join slf lookup variables function finished at {Sys.time()}")
log_ind_substage("Join slf lookup variables function", "finished", year)

log_ind_substage("Create individual file", "finished", year)

return(individual_file)
}
Loading