RESTWS-405 - Implementing feedback. Included the isRetired parameter …

…in getOrderFrequencies method.
openmrs · Feb 13, 2014 · 175ca28 · 175ca28
1 parent a0968b5
commit 175ca28
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/api/src/main/java/org/openmrs/api/OrderService.java b/api/src/main/java/org/openmrs/api/OrderService.java
@@ -297,8 +297,9 @@ public <Ord extends Order> List<Ord> getActiveOrders(Patient patient, Class<Ord>
 	 * @return List<OrderFrequency>
 	 * @since 1.10
 	 * @should return all the order frequencies
+	 * @param includeRetired
 	 */
-	public List<OrderFrequency> getOrderFrequencies();
+	public List<OrderFrequency> getOrderFrequencies(boolean includeRetired);
 
 	/**
 	 * Discontinues an order. Creates a new order that discontinues the orderToDiscontinue

diff --git a/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
@@ -384,10 +384,11 @@ public OrderFrequency getOrderFrequencyByUuid(String uuid) {
 
 	/**
 	 * @see OrderService#getOrderFrequencies
+	 * @param includeRetired
 	 */
 	@Override
-	public List<OrderFrequency> getOrderFrequencies() {
-		return dao.getOrderFrequencies(false);
+	public List<OrderFrequency> getOrderFrequencies(boolean includeRetired) {
+		return dao.getOrderFrequencies(includeRetired);
 	}
 
 	/**

diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -280,18 +280,32 @@ public void getOrderFrequency_shouldReturnTheOrderFrequencyThatMatchedTheSpecifi
 	}
 
 	/**
-	 * @verifies return the order frequency that matched the specified uuid
+	 * @verifies return all active order frequencies
 	 * @see OrderService#getOrderFrequencyByUuid(String)
 	 */
 	@Test
-	public void getOrderFrequency_shouldReturnAllActiveOrderFrequencies() throws Exception {
+	public void getOrderFrequencies_shouldReturnAllActiveOrderFrequencies() throws Exception {
 		executeDataSet("org/openmrs/api/include/OrderServiceTest-getAllOrderFrequencies.xml");
-		List<OrderFrequency> orderFrequencies = Context.getOrderService().getOrderFrequencies();
+		List<OrderFrequency> orderFrequencies = Context.getOrderService().getOrderFrequencies(false);
 		Assert.assertEquals(2, orderFrequencies.size());
 		Assert.assertEquals("28090760-7c38-11e3-baa7-0800200c9a66", orderFrequencies.get(0).getUuid());
 		Assert.assertEquals("38090760-7c38-11e3-baa7-0800200c9a66", orderFrequencies.get(1).getUuid());
 	}
 
+	/**
+	 * @verifies return all order frequencies. should include retired as well.
+	 * @see OrderService#getOrderFrequencyByUuid(String)
+	 */
+	@Test
+	public void getOrderFrequencies_shouldReturnAllOrderFrequenciesIncludingRetired() throws Exception {
+		executeDataSet("org/openmrs/api/include/OrderServiceTest-getAllOrderFrequencies.xml");
+		List<OrderFrequency> orderFrequencies = Context.getOrderService().getOrderFrequencies(true);
+		Assert.assertEquals(3, orderFrequencies.size());
+		Assert.assertEquals("28090760-7c38-11e3-baa7-0800200c9a66", orderFrequencies.get(0).getUuid());
+		Assert.assertEquals("38090760-7c38-11e3-baa7-0800200c9a66", orderFrequencies.get(1).getUuid());
+		Assert.assertEquals("48090760-7c38-11e3-baa7-0800200c9a66", orderFrequencies.get(2).getUuid());
+	}
+
 	/**
 	 * @verifies return all active orders for the specified patient
 	 * @see OrderService#getActiveOrders(org.openmrs.Patient, Class, org.openmrs.CareSetting,

diff --git a/api/src/test/resources/org/openmrs/api/include/OrderServiceTest-getAllOrderFrequencies.xml b/api/src/test/resources/org/openmrs/api/include/OrderServiceTest-getAllOrderFrequencies.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset>
     <order_frequency order_frequency_id="2" concept_id="113" creator="1" date_created="2008-08-15 13:52:53.0" retired="false" uuid="38090760-7c38-11e3-baa7-0800200c9a66" />
+    <order_frequency order_frequency_id="3" concept_id="113" creator="1" date_created="2008-08-15 13:52:53.0" retired="true" uuid="48090760-7c38-11e3-baa7-0800200c9a66" />
 </dataset>