RESTWS-927: Extend encounter search endpoint to filter by encounter forms and obs concepts #596
Conversation
This file contains 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
ibacher
reviewed
Jan 29, 2024
| @@ -1,6 +1,4 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <!DOCTYPE module PUBLIC "-//OpenMRS//DTD OpenMRS Config 1.0//EN" "http://resources.openmrs.org/doctype/config-1.2.dtd"> | |||
| import java.util.stream.Collectors; | ||
|
|
||
| @Component | ||
| public class EncounterSearchHandler2_4 implements SearchHandler { |
There was a problem hiding this comment.
This should be done in the EncounterSearchHandler1_9. We only use a newer version if the query cannot be supported on older versions.
I also don't think that the support for extracting only certain obs by concepts is not a good idea for something that's applied to the search on Encounter itself. If we need that, that needs to be separated into a different query.
| encounters.forEach(encounter -> { | ||
| if (!conceptUuidList.isEmpty()) { | ||
| List<Obs> obs = encounter.getObs().stream().filter(ob -> conceptUuidList.contains(ob.getConcept().getUuid())).collect(Collectors.toList()); | ||
| encounter.setObs(new HashSet<>(obs)); |
There was a problem hiding this comment.
Don't modify the encounter object directly. This is very dangerous since it could result in an actual update to the database.
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 of what I changed
Issue I worked on
https://openmrs.atlassian.net/browse/RESTWS-927
see https://issues.openmrs.org/browse/RESTWS-
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