Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RESTWS-907: Cannot search for inactive drug orders in RefApp 3.x #589

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

IamMujuziMoses
Copy link
Contributor

Issue I worked on

see https://issues.openmrs.org/browse/RESTWS-907

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 --amend

  • I 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 --amend

  • I ran mvn clean package right before creating this pull request and
    added 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

@IamMujuziMoses
Copy link
Contributor Author

@ibacher @dkayiwa could you please review this PR

import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.stream.Collectors;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are you using the above import?

import java.util.List;
import java.util.ListIterator;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are you using the above import?

* @param delegate the object that simple represents
*/

private void maybeDecorateWithStatus(SimpleObject simple, T delegate) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to have this kind of class-specific logic here instead of in, say, an order-focused endpoint? This seems very hacky...

* @param checkDate to check against the order.autoExpireDate
* @return boolean true or false if the order.autoExpireDate is passed or not
*/
private boolean isExpired(Order order, Date checkDate) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto on this.

@IamMujuziMoses IamMujuziMoses force-pushed the RESTWS-907 branch 3 times, most recently from 1a4d49a to d1091f5 Compare October 5, 2023 10:52
* @return Status
*/
@PropertyGetter("status")
public String getStatus(Order order) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ibacher, how about something like this?!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants