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-716: Orders resource returns no results when only status is specified #585

Merged
merged 2 commits into from
Sep 24, 2023

Conversation

IamMujuziMoses
Copy link
Contributor

Issue I worked on

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

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 IamMujuziMoses force-pushed the RESTWS-716 branch 2 times, most recently from 92c0c08 to 20ee5a5 Compare August 30, 2023 10:30
@dkayiwa
Copy link
Member

dkayiwa commented Sep 4, 2023

@IamMujuziMoses can you add a test in the OrderController1_10Test?

@IamMujuziMoses
Copy link
Contributor Author

@dkayiwa, I have added a test in OrderController1_10Test, is that the test you required, or something else?!

@dkayiwa
Copy link
Member

dkayiwa commented Sep 4, 2023

@IamMujuziMoses the test should deal with what you are fixing. In other words, a test which would fail if your fix is not in.

);
SimpleObject orders = deserialize(handle(req));
ArrayList<Object> resp = (ArrayList<Object>) PropertyUtils.getProperty(orders, "results");
assertEquals(activeTestOrderCount + activeDrugOrderCount, resp.size());
Copy link
Contributor

Choose a reason for hiding this comment

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

@IamMujuziMoses we can use activeDrugOrders.size() + activeTestOrders.size() without creating two variables.

Suggested change
assertEquals(activeTestOrderCount + activeDrugOrderCount, resp.size());
assertEquals( activeDrugOrders.size() + activeTestOrders.size(), resp.size());

@@ -273,9 +274,10 @@ protected PageableResult doSearch(RequestContext context) throws ResponseExcepti
else {
return new NeedsPaging<Order>(orders, context);
}
} else {
throw new InvalidSearchException("Please specify patient parameter with valid patientUuid");
Copy link
Member

Choose a reason for hiding this comment

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

The error message reads as if one specified a patient parameter but with an invalid uuid.

@@ -589,4 +590,36 @@ public void invalidCareCenterShouldThrowException() throws Exception {
);
handle(req);
}

@Test(expected = InvalidSearchException.class)
public void doSearch_shouldReturnExceptionNotNullSetIfNoPatientUuidIsSpecified() throws Exception {
Copy link
Member

Choose a reason for hiding this comment

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

I do not seem to understand the meaning of this method name.

null, null);

// get all test orders
List<Order> activeTestOrders = orderService.getActiveOrders(patient, orderService.getOrderTypeByName("Test order"),
Copy link
Member

Choose a reason for hiding this comment

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

How many active test orders do you expect?

}

@Test
public void shouldGetOrdersByPatientUuid() throws Exception {
Copy link
Member

Choose a reason for hiding this comment

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

Do you mind explaining how this test is related to the ticket?

@dkayiwa dkayiwa merged commit f038fbb into openmrs:master Sep 24, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants