The API should be able to assign OrderTypes - TRUNK-4302

openmrs · Mar 17, 2014 · d1abac0 · wluyima · Mar 18, 2014 · wluyima
1 parent f394446
commit d1abac0
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/api/OrderService.java b/api/src/main/java/org/openmrs/api/OrderService.java
@@ -63,6 +63,8 @@ public interface OrderService extends OpenmrsService {
 	 * @should save a revised order
 	 * @should set order number specified in the context if specified
 	 * @should set the order number returned by the configured generator
+	 * @should set order type if null but mapped to the concept class
+	 * @should fail if order type is null and not mapped to the concept class
 	 */
 	@Authorized( { PrivilegeConstants.EDIT_ORDERS, PrivilegeConstants.ADD_ORDERS })
 	public Order saveOrder(Order order, OrderContext orderContext) throws APIException;

diff --git a/api/src/main/java/org/openmrs/api/db/OrderDAO.java b/api/src/main/java/org/openmrs/api/db/OrderDAO.java
@@ -19,6 +19,7 @@
 
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;
+import org.openmrs.ConceptClass;
 import org.openmrs.Encounter;
 import org.openmrs.Order;
 import org.openmrs.OrderFrequency;
@@ -194,4 +195,12 @@ public List<OrderFrequency> getOrderFrequencies(String searchPhrase, Locale loca
 	 * @See OrderService#getOrderTypes
 	 */
 	public List<OrderType> getOrderTypes(boolean includeRetired);
+
+	/**
+	 * Gets the order type mapped to a given concept class
+	 * 
+	 * @param conceptClass the concept class
+	 * @return the matching order type
+	 */
+	public OrderType getOrderTypeByConceptClass(ConceptClass conceptClass);
 }
diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
@@ -35,6 +35,7 @@
 import org.hibernate.transform.DistinctRootEntityResultTransformer;
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;
+import org.openmrs.ConceptClass;
 import org.openmrs.Encounter;
 import org.openmrs.GlobalProperty;
 import org.openmrs.Order;
@@ -470,4 +471,14 @@ public List<OrderType> getOrderTypes(boolean includeRetired) {
 		}
 		return c.list();
 	}
+
+	/**
+	 * @see org.openmrs.api.db.OrderDAO#getOrderTypeByConceptClass(org.openmrs.ConceptClass)
+	 */
+	@Override
+	public OrderType getOrderTypeByConceptClass(ConceptClass conceptClass) {
+		return (OrderType) sessionFactory.getCurrentSession().createQuery(
+		    "from OrderType where :conceptClass in elements(conceptClasses)").setParameter("conceptClass", conceptClass)
+		        .uniqueResult();
+	}
 }
diff --git a/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
@@ -24,6 +24,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;
+import org.openmrs.ConceptClass;
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
 import org.openmrs.GlobalProperty;
@@ -83,6 +84,14 @@ public Order saveOrder(Order order, OrderContext orderContext) throws APIExcepti
 			throw new APIException("Cannot edit an existing order, you need to revise it instead");
 		}
 
+		if (order.getOrderType() == null) {
+			OrderType orderType = getOrderTypeByConcept(order.getConcept());
+			if (orderType == null) {
+				throw new APIException("No order type matches the concept class");
+			}
+			order.setOrderType(orderType);
+		}
+
 		if (Order.Action.REVISE.equals(order.getAction())) {
 			Order previousOrder = order.getPreviousOrder();
 			if (previousOrder == null) {
@@ -595,4 +604,24 @@ public OrderType getOrderTypeByUuid(String uuid) {
 	public List<OrderType> getOrderTypes(boolean includeRetired) {
 		return dao.getOrderTypes(includeRetired);
 	}
+
+	/**
+	 * Gets the order type mapped to a given concept
+	 * 
+	 * @param concept the concept
+	 * @return the matching order type
+	 */
+	private OrderType getOrderTypeByConcept(Concept concept) {
+		return getOrderTypeByConceptClass(concept.getConceptClass());
+	}
+
+	/**
+	 * Gets the order type mapped to a given concept class
+	 * 
+	 * @param conceptClass the concept class
+	 * @return the matching order type
+	 */
+	private OrderType getOrderTypeByConceptClass(ConceptClass conceptClass) {
+		return dao.getOrderTypeByConceptClass(conceptClass);
+	}
 }
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -1408,4 +1408,41 @@ public void getAllOrdersByPatient_shouldGetAllTheOrdersForTheSpecifiedPatient()
 		assertEquals(12, orderService.getAllOrdersByPatient(patientService.getPatient(2)).size());
 		assertEquals(2, orderService.getAllOrdersByPatient(patientService.getPatient(7)).size());
 	}
+
+	/**
+	 * @verifies set order type if null but mapped to the concept class
+	 * @see OrderService#saveOrder(org.openmrs.Order, OrderContext)
+	 */
+	@Test
+	public void saveOrder_shouldSetOrderTypeIfNullButMappedToTheConceptClass() throws Exception {
+		executeDataSet(OTHER_ENCOUNTERS_XML);
+		Order order = new Order();
+		order.setPatient(patientService.getPatient(2));
+		order.setConcept(conceptService.getConcept(5497));
+		order.setOrderer(providerService.getProvider(1));
+		order.setCareSetting(orderService.getCareSetting(1));
+		order.setEncounter(encounterService.getEncounter(6));
+		order.setStartDate(new Date());
+		order = orderService.saveOrder(order, null);
+		assertTrue(order.getOrderType().getOrderTypeId() == 1);
+	}
+
+	/**
+	 * @verifies fail if order type is null and not mapped to the concept class
+	 * @see OrderService#saveOrder(org.openmrs.Order, OrderContext)
+	 */
+	@Test
+	public void saveOrder_shouldFailIfOrderTypeIsNullAndNotMappedToTheConceptClass() throws Exception {
+		executeDataSet(OTHER_ENCOUNTERS_XML);
+		Order order = new Order();
+		order.setPatient(patientService.getPatient(2));
+		order.setConcept(conceptService.getConcept(3));
+		order.setOrderer(providerService.getProvider(1));
+		order.setCareSetting(orderService.getCareSetting(1));
+		order.setEncounter(encounterService.getEncounter(6));
+		order.setStartDate(new Date());
+		expectedException.expect(APIException.class);
+		expectedException.expectMessage("No order type matches the concept class");
+		orderService.saveOrder(order, null);
+	}
 }
diff --git a/api/src/test/java/org/openmrs/api/db/hibernate/HibernateOrderDAOTest.java b/api/src/test/java/org/openmrs/api/db/hibernate/HibernateOrderDAOTest.java
@@ -0,0 +1,39 @@
+package org.openmrs.api.db.hibernate;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openmrs.ConceptClass;
+import org.openmrs.OrderType;
+import org.openmrs.api.context.Context;
+import org.openmrs.test.BaseContextSensitiveTest;
+
+public class HibernateOrderDAOTest extends BaseContextSensitiveTest {
+
+	private HibernateOrderDAO dao = null;
+
+	/**
+	 * Run this before each unit test in this class.
+	 *
+	 * @throws Exception
+	 */
+	@Before
+	public void runBeforeEachTest() throws Exception {
+
+		if (dao == null) {
+			dao = (HibernateOrderDAO) applicationContext.getBean("orderDAO");
+		}
+	}
+
+	/**
+	 * @see HibernateOrderDAO#getOrderTypeByConceptClass(ConceptClass)
+	 * @verifies return order type mapped to given concept class
+	 */
+	@Test
+	public void getAllPatientIdentifierTypes_shouldReturnOrderTypeMappedToGivenConceptClass() throws Exception {
+		OrderType orderType = dao.getOrderTypeByConceptClass(Context.getConceptService().getConceptClass(1));
+
+		Assert.assertNotNull(orderType);
+		Assert.assertTrue(orderType.getOrderTypeId() == 1);
+	}
+}