Skip to content

Commit 0d72cb3

Browse files
OluwatobiOniJennit07lizihao-anu
authored
BYOC_ID: 40058 Setup logger (#1217)
* Initialise logger for BYOC * Updating the PR based on Lisa's review * setup logger - read_extract and process_extract * setup logger - process_tests_xxxxx * initialise logger: create_ep_file/create_ind_file * resolve homelessness merge conflict * PR review - 01 * file name coding --------- Co-authored-by: Jennifer Thom <67372904+Jennit07@users.noreply.github.com> Co-authored-by: Zihao Li <zihao.li@phs.scot> Co-authored-by: lizihao-anu <97514488+lizihao-anu@users.noreply.github.com>
1 parent 6d33e69 commit 0d72cb3

124 files changed

Lines changed: 942 additions & 202 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Imports:
2525
hms (>= 1.1.0),
2626
janitor (>= 2.2.0),
2727
keyring (>= 1.3.0),
28+
logger (>= 0.4.1),
2829
lubridate (>= 1.9.2),
2930
magrittr (>= 2.0.3),
3031
odbc (>= 1.3.1),

NAMESPACE

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ export(is_missing)
9595
export(last_date_month)
9696
export(latest_cost_year)
9797
export(latest_update)
98+
export(log_ep_message)
99+
export(log_ep_substage)
100+
export(log_ind_message)
101+
export(log_ind_substage)
102+
export(log_slf_event)
103+
export(log_tar_message)
98104
export(make_lowercase_ext)
99105
export(midpoint_fy)
100106
export(next_fy)
@@ -198,6 +204,7 @@ export(setup_keyring)
198204
export(start_fy)
199205
export(start_fy_quarter)
200206
export(start_next_fy_quarter)
207+
export(write_console_output)
201208
export(write_file)
202209
export(write_temp_data)
203210
export(years_to_run)

R/create_episode_file.R

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ create_episode_file <- function(
3333
write_to_disk = TRUE,
3434
write_temp_to_disk = FALSE
3535
) {
36-
cli::cli_alert_info("Create episode file function started at {Sys.time()}")
36+
log_ep_substage("Create episode file", "started", year)
3737

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

@@ -317,7 +317,7 @@ store_ep_file_vars <- function(data, year, vars_to_keep) {
317317
group_id = 3356 # sourcedev owner
318318
)
319319

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

322322
return(
323323
dplyr::select(
@@ -352,7 +352,7 @@ load_ep_file_vars <- function(data, year) {
352352

353353
fs::file_delete(tempfile_path)
354354

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

357357
return(full_data)
358358
}
@@ -409,7 +409,7 @@ fill_missing_cij_markers <- function(data) {
409409

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

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

414414
return(return_data)
415415
}
@@ -455,7 +455,7 @@ correct_cij_vars <- function(data) {
455455
)
456456
)
457457

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

460460
return(data)
461461
}
@@ -483,7 +483,7 @@ create_cost_inc_dna <- function(data) {
483483
)
484484
)
485485

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

488488
return(data)
489489
}
@@ -510,7 +510,7 @@ create_cohort_lookups <- function(data, year, update = latest_update()) {
510510
write_to_disk = TRUE
511511
)
512512

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

515515
return(data)
516516
}
@@ -545,7 +545,7 @@ join_cohort_lookups <- function(
545545
by = "anon_chi"
546546
)
547547

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

550550
return(join_cohort_lookups)
551551
}
@@ -612,7 +612,9 @@ join_sc_client <- function(data,
612612
)
613613
}
614614

615-
cli::cli_alert_info("Join social care client function finished at {Sys.time()}")
615+
log_ep_substage("Join social care client", "finished", year)
616+
617+
log_ep_substage("Create episode file", "finished", year)
616618

617619
return(data_file)
618620
}

R/create_individual_file.R

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ create_individual_file <- function(
1717
write_to_disk = TRUE,
1818
write_temp_to_disk
1919
) {
20-
cli::cli_alert_info("Create individual file function started at {Sys.time()}")
20+
log_ind_substage("Create individual file", "started", year)
2121

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

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

182182
return(episode_file)
183183
}
@@ -218,7 +218,7 @@ add_cij_columns <- function(episode_file) {
218218
)
219219
)
220220

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

223223
return(episode_file)
224224
}
@@ -276,7 +276,7 @@ add_all_columns <- function(episode_file, year) {
276276
)
277277
)
278278

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

281281
return(episode_file)
282282
}
@@ -293,7 +293,7 @@ add_acute_columns <- function(episode_file, prefix, condition) {
293293
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
294294
add_ipdc_cols(prefix, condition)
295295

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

298298
return(episode_file)
299299
}
@@ -308,7 +308,7 @@ add_mat_columns <- function(episode_file, prefix, condition) {
308308
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
309309
add_ipdc_cols(prefix, condition, elective = FALSE)
310310

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

313313
return(episode_file)
314314
}
@@ -323,7 +323,7 @@ add_mh_columns <- function(episode_file, prefix, condition) {
323323
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
324324
add_ipdc_cols(prefix, condition, ipdc_d = FALSE)
325325

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

328328
return(episode_file)
329329
}
@@ -338,7 +338,7 @@ add_gls_columns <- function(episode_file, prefix, condition) {
338338
add_standard_cols(prefix, condition, episode = TRUE, cost = TRUE) %>%
339339
add_ipdc_cols(prefix, condition, ipdc_d = FALSE)
340340

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

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

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

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

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

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

398398
return(episode_file)
399399
}
@@ -430,7 +430,7 @@ add_ooh_columns <- function(episode_file, prefix, condition) {
430430
)
431431
)
432432

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

435435
return(episode_file)
436436
}
@@ -457,7 +457,7 @@ add_dn_columns <- function(episode_file, prefix, condition) {
457457
dplyr::mutate("{prefix}_contacts" := NA_integer_)
458458
}
459459

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

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

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

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

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

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

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

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

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

531531
return(episode_file)
532532
}
@@ -540,7 +540,7 @@ add_hl1_columns <- function(episode_file, prefix, condition) {
540540
episode_file <- episode_file %>%
541541
add_standard_cols(prefix, condition)
542542

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

545545
return(episode_file)
546546
}
@@ -574,7 +574,7 @@ add_ch_columns <- function(episode_file, prefix, condition) {
574574
)
575575
)
576576

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

579579
return(episode_file)
580580
}
@@ -622,7 +622,7 @@ add_hc_columns <- function(episode_file, prefix, condition) {
622622
"{prefix}_reablement_hours_cost" := dplyr::if_else(eval(condition_reabl), .data$cost_total_net, NA_real_)
623623
)
624624

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

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

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

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

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

665665
return(episode_file)
666666
}
@@ -708,7 +708,7 @@ add_ipdc_cols <- function(episode_file, prefix, condition, ipdc_d = TRUE, electi
708708
)
709709
}
710710

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

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

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

735735
return(episode_file)
736736
}
@@ -775,7 +775,7 @@ clean_up_ch <- function(episode_file, year) {
775775
) %>%
776776
dplyr::select(-c("fy_end", "fy_start", "term_1", "term_2"))
777777

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

780780
return(episode_file)
781781
}
@@ -796,7 +796,7 @@ recode_gender <- function(episode_file) {
796796
)
797797
)
798798

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

801801
return(episode_file)
802802
}
@@ -812,7 +812,7 @@ condition_cols <- function() {
812812
date_cols <- paste0(conditions, "_date")
813813
all_cols <- c(conditions, date_cols)
814814

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

817817
return(all_cols)
818818
}
@@ -858,7 +858,7 @@ clean_individual_file <- function(individual_file, year) {
858858
clean_up_gender() %>%
859859
dplyr::mutate(age = compute_mid_year_age(year, .data$dob))
860860

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

863863
return(individual_file)
864864
}
@@ -881,7 +881,7 @@ clean_up_gender <- function(individual_file) {
881881
# change back to anon_chi
882882
slfhelper::get_anon_chi()
883883

884-
cli::cli_alert_info("Clean up gender column function finished at {Sys.time()}")
884+
log_ind_substage("Clean up gender column function", "finished", year)
885885
return(individual_file)
886886
}
887887

@@ -913,7 +913,9 @@ join_slf_lookup_vars <- function(individual_file,
913913
) %>%
914914
dplyr::rename(hbrescode = hbrescode_var)
915915

916-
cli::cli_alert_info("Join slf lookup variables function finished at {Sys.time()}")
916+
log_ind_substage("Join slf lookup variables function", "finished", year)
917+
918+
log_ind_substage("Create individual file", "finished", year)
917919

918920
return(individual_file)
919921
}

0 commit comments

Comments
 (0)