FM2-534: Searching should provide method to ensure consistent sort order #453
Conversation
(WIP, not working)
There was a problem hiding this comment.
@ibacher I played around with a few approaches to this with no luck so far, I wanted to share this one to get your thoughts. Basically in the Encounter Resource Provider search method I tried to change the ReferenceAndListParams to ReferenceOrListParams, but it ends up throwing an error (see below).
I also tried breaking this into different multiple parameters (one for "subject.name", one for "subject.identifier", etc) but this didn't seem to work, though I could pursue it further if it seems like the right approach.
I'm also conscious of going to too many rabbit holes here and doing a major refactor, it may be worth me stepping back and thinking about other approaches entirely for the search we are looking to do (we may need to end up building a whole custom search for the dispensing app anyway).
| @@ -148,7 +149,7 @@ public IBundleProvider searchEncounter(@OptionalParam(name = Encounter.SP_DATE) | |||
| } | |||
|
|
|||
| return new SearchQueryBundleProviderR3Wrapper(encounterService | |||
| .searchForEncounters(new EncounterSearchParams(date, location, participantReference, subjectReference, | |||
| .searchForEncounters(new EncounterSearchParams(date, new ReferenceAndListParam().addAnd(location), new ReferenceAndListParam().addAnd(participantReference), new ReferenceAndListParam().addAnd(subjectReference), | |||
There was a problem hiding this comment.
And the created a new And from the Or here, so that the other methods could remain the same...
| @@ -115,15 +116,15 @@ public OperationOutcome deleteEncounter(@IdParam @Nonnull IdType id) { | |||
| public IBundleProvider searchEncounter(@OptionalParam(name = Encounter.SP_DATE) DateRangeParam date, | |||
| @OptionalParam(name = Encounter.SP_LOCATION, chainWhitelist = { "", Location.SP_ADDRESS_CITY, | |||
| Location.SP_ADDRESS_STATE, Location.SP_ADDRESS_COUNTRY, | |||
| Location.SP_ADDRESS_POSTALCODE }, targetTypes = Location.class) ReferenceAndListParam location, | |||
| Location.SP_ADDRESS_POSTALCODE }, targetTypes = Location.class) ReferenceOrListParam location, | |||
There was a problem hiding this comment.
So I changed all these from And to Or...
| String uri = String.format("/Encounter?subject.identifier=101-6&subject.name=Chebaskwony"); | ||
| MockHttpServletResponse response = get(uri).accept(FhirMediaTypes.XML).go(); | ||
|
|
||
| Bundle results = readBundleResponse(response); |
There was a problem hiding this comment.
This test is now failing and returning a "Multiple values detected for non-repeatable parameter 'subject'. This server is not configured to allow multiple (AND/OR) values for this param" message
(WIP, not working)
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/FM2-
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master