Skip to content

Commit 50a1e3c

Browse files
authored
refactor: 🔧 move classify_diabetes() inputs into a list (#492)
## Description Split from #490 Moves register inputs into a list for input checking. Allows us to add flexibility regarding the presence of register inputs, which is necessary to support LPR_A alongside LPR_F.
1 parent a753f10 commit 50a1e3c

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

R/classify-diabetes.R

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,28 +80,23 @@ classify_diabetes <- function(
8080
bef = bef,
8181
lmdb = lmdb
8282
) |>
83+
purrr::discard(is.null) |>
8384
purrr::map(verify_duckdb)
8485

8586
# Verification step -----
86-
kontakter <- select_required_variables(registers$kontakter, "kontakter")
87-
diagnoser <- select_required_variables(registers$diagnoser, "diagnoser")
88-
lpr_diag <- select_required_variables(registers$lpr_diag, "lpr_diag")
89-
lpr_adm <- select_required_variables(registers$lpr_adm, "lpr_adm")
90-
sysi <- select_required_variables(registers$sysi, "sysi")
91-
sssy <- select_required_variables(registers$sssy, "sssy")
92-
lab_forsker <- select_required_variables(registers$lab_forsker, "lab_forsker")
93-
bef <- select_required_variables(registers$bef, "bef")
94-
lmdb <- select_required_variables(registers$lmdb, "lmdb")
87+
registers <- registers |>
88+
purrr::imap(\(table, name) select_required_variables(table, name))
9589

9690
# Initially processing -----
91+
9792
lpr2 <- prepare_lpr2(
98-
lpr_diag = lpr_diag,
99-
lpr_adm = lpr_adm
93+
lpr_diag = registers$lpr_diag,
94+
lpr_adm = registers$lpr_adm
10095
)
10196

10297
lpr3 <- prepare_lpr3(
103-
kontakter = kontakter,
104-
diagnoser = diagnoser
98+
kontakter = registers$kontakter,
99+
diagnoser = registers$diagnoser
105100
)
106101

107102
pregnancy_dates <- keep_pregnancy_dates(
@@ -128,21 +123,21 @@ classify_diabetes <- function(
128123
)
129124

130125
podiatrist_services <- keep_podiatrist_services(
131-
sysi = sysi,
132-
sssy = sssy
126+
sysi = registers$sysi,
127+
sssy = registers$sssy
133128
)
134129

135130
gld_purchases <- keep_gld_purchases(
136-
lmdb = lmdb
131+
lmdb = registers$lmdb
137132
)
138133

139134
hba1c_over_threshold <- keep_hba1c(
140-
lab_forsker = lab_forsker
135+
lab_forsker = registers$lab_forsker
141136
)
142137

143138
# Drop steps -----
144139
gld_hba1c_after_drop_steps <- gld_purchases |>
145-
drop_pcos(bef = bef) |>
140+
drop_pcos(bef = registers$bef) |>
146141
drop_pregnancies(
147142
pregnancy_dates = pregnancy_dates,
148143
included_hba1c = hba1c_over_threshold

0 commit comments

Comments
 (0)