Skip to content

RESTWS-945: Orders should allow sorting by date #656

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.

Sign up for GitHub

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

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

RESTWS-945: Orders should allow sorting by date #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25f8d30
RESTWS-945: Orders should allow sorting by date
IamMujuziMoses May 13, 2025
7b67183
RESTWS-945: Orders should allow sorting by date
IamMujuziMoses May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,13 +268,15 @@ protected PageableResult doSearch(RequestContext context) throws ResponseExcepti
if (context.getType() != null) {
filterByType(orders, context.getType());
}


// if the user indicated a specific sort parameter, apply sort here
if (StringUtils.isNotBlank(sortParam)) {
List<Order> sortedOrder = sortOrdersBasedOnDateActivatedOrDateStopped(orders, sortParam, status);
return new NeedsPaging<Order>(sortedOrder, context);
}
else {
return new NeedsPaging<Order>(orders, context);
List<Order> descSortedOrder = sortOrdersBasedOnDateActivatedOrDateStopped(orders, "DESC", status);
return new NeedsPaging<Order>(descSortedOrder, context);
}
} else {
throw new InvalidSearchException("Please provide patientUuid in the patient parameter");
Expand Down
25 changes: 23 additions & 2 deletions ...nmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderController1_10Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public void shouldGetTheActiveOrdersForAPatientInTheSpecifiedCareSetting() throw
@Test
public void shouldGetTheActiveOrdersForAPatientAsOfTheSpecifiedDate() throws Exception {
SimpleObject results = deserialize(handle(newGetRequest(getURI(), new Parameter("patient", patientService
.getPatient(2).getUuid()), new Parameter("asOfDate", "2007-12-10"))));
.getPatient(2).getUuid()), new Parameter("status", "active"), new Parameter("asOfDate", "2007-12-10"))));

assertEquals(2, Util.getResultsSize(results));

Expand Down Expand Up @@ -566,7 +566,8 @@ public void shouldGetOrdersByOrderType() throws Exception {

// order service should return all orders when no order type filter specified
req = newGetRequest(getURI(),
new Parameter("patient", PATIENT_UUID)
new Parameter("patient", PATIENT_UUID),
new Parameter("status", "active")
);
SimpleObject orders = deserialize(handle(req));
ArrayList<Object> resp = (ArrayList<Object>) PropertyUtils.getProperty(orders, "results");
Expand Down Expand Up @@ -598,4 +599,24 @@ public void doSearch_shouldReturnExceptionIfNoPatientUuidIsSpecified() throws Ex
);
handle(req);
}

@Test
public void doSearch_shouldReturnOrdersSortedInDescendingOrderByDate() throws Exception {
SimpleObject orders = deserialize(handle(newGetRequest(getURI(),
new Parameter("patient", "da7f524f-27ce-4bb2-86d6-6d1d05312bd5"),
new Parameter("status", "active")
)));

List<Object> resultList = Util.getResultsList(orders);
assertTrue(resultList.size() >= 2);

String uuid1 = PropertyUtils.getProperty(resultList.get(0), "uuid").toString();
String uuid2 = PropertyUtils.getProperty(resultList.get(1), "uuid").toString();

Order order1 = orderService.getOrderByUuid(uuid1);
Order order2 = orderService.getOrderByUuid(uuid2);

// orders sorted by date in descending order (newest first)
assertTrue(order1.getDateActivated().after(order2.getDateActivated()));
}
}
Loading