RESTWS-945: Orders should allow sorting by date

Author: IamMujuziMoses

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java

@@ -275,7 +275,7 @@ protected PageableResult doSearch(RequestContext context) throws ResponseExcepti
 				return new NeedsPaging<Order>(sortedOrder, context);
 			}
 			else {
-				List<Order> descSortedOrder = sortOrdersInDescendingOrderByDate(orders);
+				List<Order> descSortedOrder = sortOrdersBasedOnDateActivatedOrDateStopped(orders, "DESC", status);
 				return new NeedsPaging<Order>(descSortedOrder, context);
 			}
 		} else {
@@ -292,21 +292,6 @@ private static Date getUsableDate(Order order) {
 	private static Date getActiveOrderSortDate(Order order) {
 		return order.getDateActivated() != null ? order.getDateActivated() : order.getDateCreated();
 	}
-
-	private List<Order> sortOrdersInDescendingOrderByDate(List<Order> orders) {
-		List<Order> sortedList = new ArrayList<Order>(orders);
-		Collections.sort(sortedList, new Comparator<Order>() {
-			@Override
-			public int compare(Order o1, Order o2) {
-				return getOrderSortDate(o2).compareTo(getOrderSortDate(o1));
-			}
-		});
-		return sortedList;
-	}
-
-	private static Date getOrderSortDate(Order order) {
-		return order.getDateActivated() != null ? order.getDateActivated() : order.getDateCreated();
-	}
 
 	public List<Order> sortOrdersBasedOnDateActivatedOrDateStopped(List<Order> orders, final String sortOrder,
 	        final String status) {

omod-1.10/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderController1_10Test.java

@@ -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));
 
@@ -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");
@@ -602,7 +603,8 @@ public void doSearch_shouldReturnExceptionIfNoPatientUuidIsSpecified() throws Ex
 	@Test
 	public void doSearch_shouldReturnOrdersSortedInDescendingOrderByDate() throws Exception {
 		SimpleObject orders = deserialize(handle(newGetRequest(getURI(),
-				new Parameter("patient", "da7f524f-27ce-4bb2-86d6-6d1d05312bd5")
+				new Parameter("patient", "da7f524f-27ce-4bb2-86d6-6d1d05312bd5"),
+				new Parameter("status", "active")
 		)));
 
 		List<Object> resultList = Util.getResultsList(orders);