Skip to content

Feat/migrate chem #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
droomelotdegendt wants to merge 2 commits into
base: feat/migrate-locs
Choose a base branch
from
Draft

Feat/migrate chem #136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e3dfa2
refactor(get_chem): extract query building logic *
droomelotdegendt Jul 31, 2026
7edaaf8
feat(get_chem): migrate to new DWH 'W0002_10_WATINA'
droomelotdegendt Jul 31, 2026
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
122 changes: 67 additions & 55 deletions R/get.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,64 +1224,11 @@ get_chem <- function(
)
}

# filter chemistry data for dates and locations
chemdata <-
tbl(con, "FactChemischeMeting") %>%
select(
.data$StaalID,
.data$DatumWID,
.data$ChemVarWID,
.data$MeetpuntWID,
.data$Meetwaarde,
.data$MeetwaardeMEQ,
.data$IsBelowLOQ
) %>%
inner_join(
tbl(con, "DimChemVar") %>%
select(
.data$ChemVarWID,
.data$ChemVarCode,
.data$ChemVarEenheid
),
by = "ChemVarWID"
) %>%
inner_join(
tbl(con, "DimTijd") %>%
select(
.data$DatumWID,
.data$Datum
),
by = "DatumWID"
) %>%
mutate(Datum = sql("CAST(Datum AS date)")) %>%
filter(
.data$Datum >= startdate,
.data$Datum <= enddate
) %>%
rename(loc_wid = .data$MeetpuntWID) %>%
inner_join(
locs %>%
select(
.data$loc_wid,
.data$loc_code
) %>%
distinct(),
.,
by = "loc_wid"
) %>%
select(-.data$loc_wid)
chemdata <- locs %>% build_chem_query(con, startdate, enddate)

# add relevant further attributes and rename
chem <-
chemdata %>%
left_join(
tbl(con, "ssrs_StaalEN") %>%
select(
.data$StaalID,
.data$StaalEN
),
by = "StaalID"
) %>%
# temporary values:
mutate(
lab_project_id = "0",
Expand All @@ -1299,7 +1246,7 @@ get_chem <- function(
unit = .data$ChemVarEenheid,
below_loq = .data$IsBelowLOQ,
.data$loq,
elneutr = .data$StaalEN
elneutr = .data$ENCalculated
) %>%
filter(!is.na(.data$value_mass)) %>% # empty rows occur in the DWH!
mutate(
Expand Down Expand Up @@ -1443,3 +1390,68 @@ get_chem <- function(

return(chem)
}

build_chem_query <- function(
locs,
con,
startdate,
enddate
) {
# filter chemistry data for dates and locations
chemdata <-
tbl(con, "FactChemischeMeting") %>%
select(
.data$StaalID,
.data$StaalWID,
.data$DatumWID,
.data$ChemVarWID,
.data$MeetpuntWID,
.data$Meetwaarde,
.data$MeetwaardeMEQ,
.data$IsBelowLOQ
) %>%
inner_join(
tbl(con, "DimChemVar") %>%
select(
.data$ChemVarWID,
.data$ChemVarCode,
.data$ChemVarEenheid
) %>%
filter(.data$ChemVarWID != 24),
by = "ChemVarWID"
) %>%
inner_join(
tbl(con, "DimDatum") %>%
select(
.data$DatumWID,
.data$Datum
),
by = "DatumWID"
) %>%
mutate(Datum = sql("CAST(Datum AS date)")) %>%
filter(
.data$Datum >= startdate,
.data$Datum <= enddate
) %>%
rename(loc_wid = .data$MeetpuntWID) %>%
inner_join(
locs %>%
select(
.data$loc_wid,
.data$loc_code
) %>%
distinct(),
.,
by = "loc_wid"
) %>%
select(-.data$loc_wid) %>%
left_join(
tbl(con, "DimStaal") %>%
select(
.data$StaalWID,
.data$StaalElnNbr,
.data$ENCalculated
),
by = "StaalWID"
)
}