Repository navigation
fix(api): combine range conditions on the same field in list queries - #180
Open
wakqasahmed wants to merge 1 commit into
Open
wakqasahmed wants to merge 1 commit into
wakqasahmed wants to merge 1 commit into
Conversation
Database.Query spread each parameter's filter into one object, so a second condition on the same key (e.g. created[lte] after created[gte]) replaced the first. Merge operator conditions on the same field instead, and keep replacing for plain equality values. Fixes zonelessdev#179
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
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.
Description
This fixes list filters that set two bounds on the same field, like
created[gte]withcreated[lte], so both bounds are applied instead of only the last one.Database.Queryused to spread each parameter's filter into one object, which made{ created: { $lte } }replace{ created: { $gte } }. It now merges operator conditions that target the same field, and keeps the old replace behaviour for plain equality values.Fixes #179
Type of Change
How Was This Tested?
I added
apps/api/src/__tests__/Database.spec.ts, which checks the filterQuerypasses to the model'sfind. It covers agte/lterange oncreatedalongside an equality on another field, agt/ltrange combined with astartAftercursor, and two equality conditions on one field, where the last one still wins. The first two failed on main and pass with this change. I also rannpx nx test api(33 suites, 506 tests passing),npm run format:check, eslint on the changed files andnpx nx build api.Screenshots (if applicable)
N/A
Checklist