Filter cagemates to current public housing and guard null locations - #747
Open
labkey-martyp wants to merge 2 commits into
Open
Filter cagemates to current public housing and guard null locations#747labkey-martyp wants to merge 2 commits into
labkey-martyp wants to merge 2 commits into
Conversation
The joined housing row was never filtered for end date or QC state, so closed and In Progress rows counted as current cagemates. Housing rows whose location never resolved are now excluded rather than grouped together.
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
1 participant
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
The cagemates demographics query could report animals as current cagemates when they were not. The joined housing row was filtered only on the animal being alive, so housing records that had already ended, and records still in a non-public QC state, counted toward both the cagemate list and the total. Separately, a housing row whose location does not resolve through the cage lookup carries no location at all — 101 such rows exist in the container we checked — and those need to be excluded deliberately rather than left to drop out of the results as a side effect of null comparison.
Related Pull Requests
None.
Changes
Apply the same current-housing and public-QC-state filters to both sides of the cagemates self-join, so only housing that is genuinely open and visible contributes.
Exclude housing rows with no resolved location, so they cannot collapse into one shared facility-wide group.
Drop a redundant room comparison, since room is derived from the location key and adds nothing once the locations match.