Phani | A-1205069439065526 | Add Order urgency to fetch order API (#225)

Bahmni · Aug 2, 2023 · 440647c · 440647c
1 parent d08b5b2
commit 440647c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/order/contract/BahmniOrder.java b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/order/contract/BahmniOrder.java
@@ -20,6 +20,15 @@ public class BahmniOrder {
     private Boolean hasObservations;
     private Collection<BahmniObservation> bahmniObservations;
     private String commentToFulfiller;
+    private Order.Urgency urgency;
+
+    public Order.Urgency getUrgency() {
+        return urgency;
+    }
+
+    public void setUrgency(Order.Urgency urgency) {
+        this.urgency = urgency;
+    }
 
     private Order.FulfillerStatus fulfillerStatus;
 

diff --git a/...e-api/src/main/java/org/bahmni/module/bahmnicore/service/impl/BahmniOrderServiceImpl.java b/...e-api/src/main/java/org/bahmni/module/bahmnicore/service/impl/BahmniOrderServiceImpl.java
@@ -90,6 +90,7 @@ private BahmniOrder createBahmniOrder(Order order, Collection<BahmniObservation>
         bahmniOrder.setConcept(conceptMapper.map(order.getConcept()));
         bahmniOrder.setHasObservations(CollectionUtils.isNotEmpty(bahmniObservations));
         bahmniOrder.setCommentToFulfiller(order.getCommentToFulfiller());
+        bahmniOrder.setUrgency(order.getUrgency());
 
         if(order.getFulfillerStatus() != null)
             bahmniOrder.setFulfillerStatus(order.getFulfillerStatus());

diff --git a/...i/src/test/java/org/bahmni/module/bahmnicore/service/impl/BahmniOrderServiceImplTest.java b/...i/src/test/java/org/bahmni/module/bahmnicore/service/impl/BahmniOrderServiceImplTest.java
@@ -32,6 +32,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
+import static org.openmrs.Order.Urgency.STAT;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.when;
 
@@ -137,6 +138,15 @@ public void shouldGetAppropriateBahmniOrdersDetails() {
         Assert.assertEquals(Order.FulfillerStatus.COMPLETED, bahmniOrder.getFulfillerStatus());
     }
 
+    @Test
+    public void shouldGetUrgencyForOrder() {
+        Order order = createOrder();
+        when(orderService.getOrderByUuid("someOrderUuid")).thenReturn(order);
+        List<BahmniOrder> bahmniOrders = bahmniOrderService.ordersForOrderUuid(personUUID, Arrays.asList(concept), null, "someOrderUuid");
+        verify(bahmniObsService).observationsFor(personUUID, Arrays.asList(concept), null, null, false, order, null, null);
+        Assert.assertEquals(STAT, bahmniOrders.get(0).getUrgency());
+    }
+
     private Order createOrder() {
         order = new Order();
         patient = new Patient();
@@ -154,6 +164,7 @@ private Order createOrder() {
         provider.setPerson(person);
         order.setOrderer(provider);
         order.setConcept(concept);
+        order.setUrgency(STAT);
         order.setId(1);
         order.setPatient(patient);
         CareSetting careSetting = new CareSetting();