Use the shared LDK helper for lookup normalization - #1885
Merged
labkey-martyp merged 2 commits intoSep 10, 2026
Conversation
Replaces the copied normalization loop in three trigger scripts. Field lists and error text are unchanged, so behavior is identical; the matching LDK change must be deployed first or the require() fails to compile.
This was referenced Sep 8, 2026
The new ehr_compliancedb.employeeperunit trigger script case-normalizes employeeid against its lookup target, but this table is written from an EHR task form in the EHR folder, where ehr_compliancedb.employees holds no rows, so an unpinned fk would reject every submission. The unit and category lookups were already pinned to the same folder.
labkey-bpatel
approved these changes
Sep 10, 2026
labkey-martyp
added a commit
to LabKey/LabDevKitModules
that referenced
this pull request
Sep 10, 2026
## Rationale Eleven trigger scripts across the EHR compliance and ONPRC modules had each copied the same loop for case-normalizing lookup values on write, so this adds the single shared implementation they can call instead. The helper takes the LookupValidationHelper as an argument rather than constructing one, because that class caches each lookup target's allowable values per instance: callers keep creating it at script scope, where the target table is read once per batch instead of once per row. ## Related Pull Requests - LabKey/ehrModules#1199 — converts the EHR compliance scripts to this helper. - LabKey/onprcEHRModules#1885 — converts the ONPRC scripts. This must merge and deploy first. A consumer script that requires the new function against an un-updated LDK fails at script compile time. ## Changes - Adds `LDK.Server.Utils.normalizeLookupFields`, which replaces each named field's value with the canonically-cased value from its lookup target and reports a field error for any value the target does not contain. - Documents why the validation helper is a parameter, since creating one per call would silently turn a per-batch read of each lookup target into a per-row read. ## Tasks - [x] Claude Code Review - [x] Code Review
labkey-martyp
commented
Sep 10, 2026
labkey-martyp
left a comment
labkey-martyp
left a comment
Contributor
Author
There was a problem hiding this comment.
SQL Server tests passing.
labkey-martyp
added a commit
to LabKey/ehrModules
that referenced
this pull request
Sep 10, 2026
…loop (#1199) ## Rationale `employeeperunit` and `sopdates` were the only tables in `ehr_compliancedb` without trigger scripts, so their lookup values were never canonicalized on write, and this branch both adds those scripts and replaces the normalization loop that every other script in the schema had copied verbatim. The missing canonicalization is why the ONPRC report procedures had to wrap every unit and category comparison in `lower()`; that `lower()` removal has already merged, so those reports are exposed to case drift until this deploys. Existing rows carrying off-lookup values need a backfill before this deploys. The scripts merge the old row into the new one before validating, so a stored value that no longer matches its lookup will block edits that work today. ## Related Pull Requests - LabKey/LabDevKitModules#310 — adds the shared helper this depends on, and must merge first. - LabKey/onprcEHRModules#1885 — the same conversion in the ONPRC modules. - LabKey/onprcEHRModules#1859 — removed the `lower()` calls these triggers replace. - #1191 — superseded by this branch, which carries the same two new scripts written against the shared helper. ## Changes - Adds trigger scripts for `employeeperunit` and `sopdates`, normalizing the lookup columns their schema metadata already declares. - Leaves `sopdates.sopid` out deliberately: its fk to `sops` is commented out, and a lookup against a column with no fk would reject every row. - Converts the six existing `ehr_compliancedb` scripts to the shared helper, with field lists and error text unchanged so behavior is identical.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rationale
Three ONPRC trigger scripts carried their own copy of the lookup normalization loop, and this converts them to the shared LDK helper. It is a pure refactor: the field lists and error text are unchanged, so no column starts being validated that wasn't already and no additional lookup target gets read.
Related Pull Requests
Changes
Tasks