From 501662be72a2472b3f8a8c144b8a877dd7d5eda9 Mon Sep 17 00:00:00 2001 From: Michael Seaton Date: Tue, 1 Jun 2021 07:03:53 -0400 Subject: [PATCH] TRUNK-6006: OrderService prevents saving Order Frequencies (#3790) --- .../org/openmrs/api/impl/OrderServiceImpl.java | 5 ----- .../java/org/openmrs/api/OrderServiceTest.java | 14 -------------- 2 files changed, 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 index 04892086f19c..71b999eba215 100644 --- 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 index 9ec4a2855bc3..b56ef7d54b0f 100644 --- 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) */