Fix queue entry search regression and correct duplicate detection logic#93
Open
shubhangiisinghh wants to merge 4 commits intoopenmrs:mainfrom
Open
Conversation
- Replace Criteria API with HQL and explicit fetch joins - Only fetch necessary relationships (queue, patient, priority, status, visit, queueComingFrom) - Eliminate eager loading of 13 user objects, 4 locations, and unnecessary concept variants - Reduces query from 59 joins to 11 joins (81% reduction) - Expected performance improvement: 60-80% faster response times Fixes performance issue reported on Talk: https://talk.openmrs.org/t/patient-queue-module-performance-issue/47627
- Remove DISTINCT from HQL SELECT clause - Add setResultTransformer(DISTINCT_ROOT_ENTITY) to deduplicate results - Fixes test failures where query returned 4 results instead of expected counts
- Remove DISTINCT from HQL SELECT clause - Use LinkedHashSet to remove duplicates while preserving order - Avoids deprecated setResultTransformer method - Fixes test failures expecting specific result counts
Author
|
This PR focuses on restoring correct search behavior and ensuring duplicate queue entries are properly validated. The implementation maintains full parity with existing filtering logic, and all unit and integration tests pass. I’ve prioritized correctness and stability here and welcome any suggestions for further refinement. |
|
I would suggest creating a ticket on JIRA first. It will help to track the issue and maintain proper workflow. |
|
Hi @shubhangiisinghh , Thank you for the PR! Could you please take a look on this : https://openmrs.atlassian.net/wiki/spaces/docs/pages/25477199/Pull+Request+Tips |
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
3 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.
This PR addresses two issues introduced during refactoring of the queue entry search logic:
Incorrect search filtering behavior
Duplicate queue entry validation not being triggered correctly
Problem
The getQueueEntries() method was modified to use a custom HQL implementation. This resulted in inconsistent filtering behavior compared to the original Criteria-based implementation.
Multiple integration tests failed because:
Search filters were not applied exactly as before
Returned result sets did not match expected counts
Filtering by queue, status, priority, and other criteria behaved incorrectly
getOverlappingQueueEntries() did not correctly identify active queue entries.
As a result:
Duplicate queue entries were not rejected
ValidationException was not thrown when expected
Related validator and service tests failed
Solution
Reverted getQueueEntries() to reuse the existing createCriteriaFromSearchCriteria() logic to ensure full behavioral parity.
This guarantees:
All search filters function as originally designed
No change in functional behavior
Integration tests pass without regression
Stable and predictable query behavior
Updated getOverlappingQueueEntries() to correctly detect active entries using:
Same patient
Same queue
Not voided
endedAt IS NULL (active entry)
This aligns duplicate detection with the domain rule:
An active queue entry for the same patient and queue should prevent creation of another.
Results
✅ All unit tests pass
✅ All integration tests pass
✅ Duplicate validation behaves correctly
✅ Queue transitions correctly reject duplicates
✅ No functional regressions introduced
Impact
This change restores stable search behavior and ensures correct enforcement of duplicate queue entry rules.
No schema changes were made.
Future Work
Further performance analysis of query joins and potential fetch optimization will be explored separately to ensure measurable improvements without altering functional behavior.