TRUNK-6006: OrderService prevents saving Order Frequencies (openmrs#3790

)
Parth59 · Jun 1, 2021 · 501662b · 501662b
1 parent 0e5e23f
commit 501662b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
@@ -824,11 +824,6 @@ private void stopOrder(Order orderToStop, Date discontinueDate, boolean isRetros
 	 */
 	@Override
 	public OrderFrequency saveOrderFrequency(OrderFrequency orderFrequency) throws APIException {
-		if (orderFrequency.getOrderFrequencyId() != null
-				&& dao.isOrderFrequencyInUse(orderFrequency)) {		
-			throw new CannotUpdateObjectInUseException("Order.frequency.cannot.edit");
-		}
-
 		return dao.saveOrderFrequency(orderFrequency);
 	}
 

diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -1496,20 +1496,6 @@ public void saveOrderFrequency_shouldEditAnExistingOrderFrequencyThatIsNotInUse(
 		orderService.saveOrderFrequency(orderFrequency);
 	}
 
-	/**
-	 * @see OrderService#saveOrderFrequency(OrderFrequency)
-	 */
-	@Test
-	public void saveOrderFrequency_shouldNotAllowEditingAnExistingOrderFrequencyThatIsInUse() {
-		OrderFrequency orderFrequency = orderService.getOrderFrequency(1);
-		assertNotNull(orderFrequency);
-
-		orderFrequency.setFrequencyPerDay(4d);
-		expectedException.expect(CannotUpdateObjectInUseException.class);
-		expectedException.expectMessage("Order.frequency.cannot.edit");
-		orderService.saveOrderFrequency(orderFrequency);
-	}
-
 	/**
 	 * @see OrderService#purgeOrderFrequency(OrderFrequency)
 	 */