TRUNK-4389 Added orderType check

openmrs · Jul 7, 2014 · 08e0bc1 · 08e0bc1
1 parent ebd30d3
commit 08e0bc1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 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
@@ -142,6 +142,11 @@ public synchronized Order saveOrder(Order order, OrderContext orderContext) thro
 			discontinueExistingOrdersIfNecessary(order);
 		}
 
+		if (!order.getOrderType().getJavaClass().isAssignableFrom(order.getClass())) {
+			throw new APIException("Order type class " + order.getOrderType().getJavaClass()
+			        + " does not match the order class " + order.getClass().getName());
+		}
+
 		if (previousOrder != null) {
 			//Check that patient, careSetting, concept and drug if is drug order have not changed
 			//we need to use a SQL query to by pass the hibernate cache

diff --git a/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java b/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java
@@ -360,7 +360,7 @@ public void shouldAllowEditingADiscontinuationOrder() throws Exception {
 
 	@Test
 	public void shouldAllowRetrospectiveDataEntryOfOrders() throws Exception {
-		Order order = new Order();
+		Order order = new TestOrder();
 		order.setPatient(patientService.getPatient(2));
 		order.setCareSetting(orderService.getCareSetting(2));
 		order.setConcept(conceptService.getConcept(5089));

diff --git a/api/src/test/java/org/openmrs/OrderTest.java b/api/src/test/java/org/openmrs/OrderTest.java
@@ -69,7 +69,8 @@ protected static void assertThatAllFieldsAreCopied(Order original, String method
 			} else {
 				try {
 					fieldValue = field.getType().newInstance();
-				} catch (InstantiationException e) {
+				}
+				catch (InstantiationException e) {
 					fieldValue = null;
 				}
 			}

diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -1424,7 +1424,7 @@ public void saveOrder_shouldPassIfAnActiveOrderForTheSameConceptExistsInADiffere
 		assertEquals(cd4Count, duplicateOrder.getConcept());
 		int initialActiveOrderCount = orderService.getActiveOrders(patient, null, null, null).size();
 
-		Order order = new Order();
+		TestOrder order = new TestOrder();
 		order.setPatient(patient);
 		order.setCareSetting(orderService.getCareSetting(2));
 		order.setConcept(cd4Count);
@@ -1635,14 +1635,14 @@ public void getAllOrdersByPatient_shouldGetAllTheOrdersForTheSpecifiedPatient()
 	 */
 	@Test
 	public void saveOrder_shouldSetOrderTypeIfNullButMappedToTheConceptClass() throws Exception {
-		Order order = new Order();
+		TestOrder order = new TestOrder();
 		order.setPatient(patientService.getPatient(7));
 		order.setConcept(conceptService.getConcept(5497));
 		order.setOrderer(providerService.getProvider(1));
 		order.setCareSetting(orderService.getCareSetting(1));
 		order.setEncounter(encounterService.getEncounter(3));
 		order.setStartDate(new Date());
-		order = orderService.saveOrder(order, null);
+		orderService.saveOrder(order, null);
 		assertEquals(2, order.getOrderType().getOrderTypeId().intValue());
 	}
 
@@ -1791,14 +1791,14 @@ public void getOrderSubTypes_shouldGetAllSubOrderTypesWithoutRetiredOrderTypes()
 	 */
 	@Test
 	public void saveOrder_shouldDefaultToCareSettingAndOrderTypeDefinedInTheOrderContextIfNull() throws Exception {
-		Order order = new Order();
+		Order order = new TestOrder();
 		order.setPatient(patientService.getPatient(7));
 		Concept trimune30 = conceptService.getConcept(792);
 		order.setConcept(trimune30);
 		order.setOrderer(providerService.getProvider(1));
 		order.setEncounter(encounterService.getEncounter(3));
 		order.setStartDate(new Date());
-		OrderType expectedOrderType = orderService.getOrderType(3);
+		OrderType expectedOrderType = orderService.getOrderType(2);
 		CareSetting expectedCareSetting = orderService.getCareSetting(1);
 		OrderContext orderContext = new OrderContext();
 		orderContext.setOrderType(expectedOrderType);
@@ -2386,7 +2386,7 @@ public void getRevisionOrder_shouldNotReturnAVoidedRevisionOrder() throws Except
 	 */
 	@Test
 	public void saveOrder_shouldPassForADiscontinuationOrderWithNoPreviousOrder() throws Exception {
-		Order dcOrder = new Order();
+		TestOrder dcOrder = new TestOrder();
 		dcOrder.setAction(Action.DISCONTINUE);
 		dcOrder.setPatient(patientService.getPatient(2));
 		dcOrder.setCareSetting(orderService.getCareSetting(2));