RESTWS-716: Orders resource returns no results when only status is sp…

…ecified (#585) * RESTWS-716: Orders resource returns no results when only status is specified * RESTWS-716: Orders resource returns no results when only status is specified
openmrs · Sep 24, 2023 · f038fbb · f038fbb
1 parent e4ae0d7
commit f038fbb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java
@@ -33,6 +33,7 @@
 import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingResourceDescription;
 import org.openmrs.module.webservices.rest.web.resource.impl.EmptySearchResult;
 import org.openmrs.module.webservices.rest.web.resource.impl.NeedsPaging;
+import org.openmrs.module.webservices.rest.web.response.InvalidSearchException;
 import org.openmrs.module.webservices.rest.web.response.ObjectNotFoundException;
 import org.openmrs.module.webservices.rest.web.response.ResourceDoesNotSupportOperationException;
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
@@ -273,9 +274,10 @@ protected PageableResult doSearch(RequestContext context) throws ResponseExcepti
 			else {
 				return new NeedsPaging<Order>(orders, context);
 			}
+		} else {
+			throw new InvalidSearchException("Please provide patientUuid in the patient parameter");
 		}
-
-		return new EmptySearchResult();
+
 	}
 
 	private static Date getUsableDate(Order order) {

diff --git a/...nmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderController1_10Test.java b/...nmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderController1_10Test.java
@@ -26,6 +26,7 @@
 import org.openmrs.module.webservices.rest.test.Util;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.RestTestConstants1_10;
+import org.openmrs.module.webservices.rest.web.response.InvalidSearchException;
 import org.openmrs.module.webservices.rest.web.response.ObjectNotFoundException;
 import org.openmrs.module.webservices.rest.web.response.ResourceDoesNotSupportOperationException;
 import org.openmrs.module.webservices.rest.web.v1_0.controller.MainResourceControllerTest;
@@ -361,7 +362,7 @@ public void shouldReviseAnActiveOrder() throws Exception {
 		revisedOrder.add("orderer", "c2299800-cca9-11e0-9572-0800200c9a66");
 		revisedOrder.add("instructions", "To be taken after a meal");
 		revisedOrder.add("orderReasonNonCoded", "Changed instructions");
-		
+
 		SimpleObject savedOrder = deserialize(handle(newPostRequest(getURI(), revisedOrder)));
 
 		List<Order> newActiveOrders = orderService.getActiveOrders(patient, null, null, null);
@@ -589,4 +590,12 @@ public void invalidCareCenterShouldThrowException() throws Exception {
 		        );
 		handle(req);
 	}
+
+	@Test(expected = InvalidSearchException.class)
+	public void doSearch_shouldReturnExceptionIfNoPatientUuidIsSpecified() throws Exception {
+		MockHttpServletRequest req = newGetRequest(getURI(),
+				new Parameter("status", "active")
+		);
+		handle(req);
+	}
 }