RESTWS-760: Order resource does not include drug strength#661
Open
IamMujuziMoses wants to merge 2 commits intoopenmrs:masterfrom
Open
RESTWS-760: Order resource does not include drug strength#661IamMujuziMoses wants to merge 2 commits intoopenmrs:masterfrom
IamMujuziMoses wants to merge 2 commits intoopenmrs:masterfrom
Conversation
Contributor
Author
|
@djazayeri @ibacher @dkayiwa could you please review this PR, your feedback will be appreciated. |
Member
|
Is there a reason you're making the change in the BaseDelegatingResource instead of the DrugOrderResource? |
Contributor
Author
|
Let me make the changes in |
IamMujuziMoses
commented
Jun 10, 2025
| * | ||
| * @param delegate the DrugOrder object that simple represents | ||
| */ | ||
| private void decorateWithStrengthProperty(SimpleObject simple, Order delegate) { |
6206bfc to
6a720bc
Compare
IamMujuziMoses
commented
Jun 12, 2025
| } | ||
|
|
||
| @PropertyGetter("strength") | ||
| public String getStrength(DrugOrder delegate) { |
Member
|
@IamMujuziMoses do you mind looking into these merge conflicts? |
6a720bc to
d55c954
Compare
d55c954 to
44d4055
Compare
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.
Issue I worked on
see https://issues.openmrs.org/browse/RESTWS-760
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 masterScreenshots
Strength property from Postman