FM2-589: Add support for Json patching operations - Encounter Resource #489
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
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #489 +/- ##
============================================
- Coverage 77.50% 77.43% -0.08%
Complexity 2631 2631
============================================
Files 243 243
Lines 7370 7380 +10
Branches 908 910 +2
============================================
+ Hits 5712 5714 +2
- Misses 1115 1121 +6
- Partials 543 545 +2
☔ View full report in Codecov by Sentry. |
ibacher
reviewed
Jun 26, 2023
| @@ -106,6 +114,62 @@ public void shouldReturnExistingEncounterAsJson() throws Exception { | |||
| assertThat(encounter, validResource()); | |||
| } | |||
|
|
|||
| @Test | |||
| public void shouldPatchExistingMedicationViaJsonMergePatch() throws Exception { | |||
There was a problem hiding this comment.
Check the naming of functions. These should also be immediately after the update tests.
ibacher
changed the title
ibacher
reviewed
Jun 30, 2023
| @@ -49,8 +53,12 @@ public class EncounterFhirResourceProviderIntegrationTest extends BaseFhirR4Inte | |||
|
|
|||
| private static final String MEDICATION_REQUEST_QUERY_INITIAL_DATA_XML = "org/openmrs/module/fhir2/api/dao/impl/FhirEncounterDaoImplTest_initial_data.xml"; // not loaded for all tests | |||
|
|
|||
| private static final String JSON_PATCH_ENCOUNTER_PATH = "org/openmrs/module/fhir2/providers/Encounter_json_patch.json"; | |||
There was a problem hiding this comment.
Could you rearrange these so it goes:
- Create
1a. Create JSON
1b. Create XML - Patch
2a. Patch JSON
Thanks
ibacher
reviewed
Jul 11, 2023
| @@ -814,6 +822,62 @@ public void shouldThrow404WhenUpdatingNonExistingVisitAsJson() throws Exception | |||
| assertThat(response.getContentAsString(), notNullValue()); | |||
| } | |||
|
|
|||
| @Test | |||
| public void shouldPatchExistingMedicationUsingJsonMergePatch() throws Exception { | |||
There was a problem hiding this comment.
@mherman22 I missed this when reviewing. Could you submit a new PR renaming these methods?
There was a problem hiding this comment.
changes are part of #506
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
Ensure Encounter resource(R4) supports json merge patch operations.
Issue I worked on
see https://issues.openmrs.org/browse/FM2-589
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