RESTWS-760: Order resource does not include drug strength

Author: IamMujuziMoses

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/DrugOrderSubclassHandler1_10.java

@@ -13,6 +13,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.openmrs.CareSetting;
+import org.openmrs.Drug;
 import org.openmrs.DrugOrder;
 import org.openmrs.Order;
 import org.openmrs.OrderType;
@@ -202,4 +203,16 @@ public static String getDisplay(DrugOrder delegate) {
 
 		return ret.toString();
 	}
+
+	@PropertyGetter("strength")
+	public String getStrength(DrugOrder delegate) {
+		StringBuilder ret = new StringBuilder();
+		if (delegate.getDrug() != null) {
+			Drug drug = delegate.getDrug();
+			ret.append(drug.getStrength() != null ? drug.getStrength() : "[no strength]");
+		} else {
+			ret.append("[no strength]");
+		}
+		return ret.toString();
+	}
 }

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java

@@ -16,8 +16,6 @@
 import io.swagger.models.properties.StringProperty;
 import org.apache.commons.lang.StringUtils;
 import org.openmrs.CareSetting;
-import org.openmrs.Drug;
-import org.openmrs.DrugOrder;
 import org.openmrs.Order;
 import org.openmrs.OrderType;
 import org.openmrs.Patient;
@@ -316,25 +314,6 @@ public int compare(Order o1, Order o2) {
 		return sortedList;
 	}
 
-	/**
-	 * If this resource is a DrugOrder, then we add a strength property to the input, and return it
-	 *
-	 * @param simple simplified representation which will be decorated with the strength property
-	 *
-	 * @param delegate the DrugOrder object that simple represents
-	 */
-	private void decorateWithStrengthProperty(SimpleObject simple, Order delegate) {
-		OrderType drugOrderType = Context.getOrderService().getOrderTypeByName("Drug order");
-		if (delegate.getOrderType().equals(drugOrderType)) {
-			Drug drug = ((DrugOrder) delegate).getDrug();
-			if (drug != null) {
-				simple.add(RestConstants.PROPERTY_FOR_STRENGTH, drug.getStrength() != null ? drug.getStrength() : "[no strength]");
-			} else {
-				simple.add(RestConstants.PROPERTY_FOR_STRENGTH,"[no strength]");
-			}
-		}
-	}
-
 	/**
 	 * @see org.openmrs.module.webservices.rest.web.resource.impl.BaseDelegatingResource#asRepresentation(Object, Representation)
 	 */
@@ -347,7 +326,12 @@ public SimpleObject asRepresentation(Order delegate, Representation representati
 		}
 
 		SimpleObject simple = super.asRepresentation(delegate, representation);
-		decorateWithStrengthProperty(simple, delegate);
+		OrderType drugOrderType = Context.getOrderService().getOrderTypeByName("Drug order");
+		if (delegate.getOrderType().equals(drugOrderType)) {
+			String strength = (String) findAndInvokeSubclassHandlerMethod("drugorder",
+					"getStrength", delegate);
+			simple.add(RestConstants.PROPERTY_FOR_STRENGTH, strength);
+		}
 		return simple;
 	}
 

omod-2.3/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_3/OrderSearchHandler2_3Test.java

@@ -220,4 +220,5 @@ public void getSearchConfig_shouldReturnOrdersByAccessionNumber() throws Excepti
         Assert.assertEquals(1, orders.size());
         Assert.assertEquals(PropertyUtils.getProperty(orders.get(0), "uuid"), "e1f95924-697a-11e3-bd76-0800271c1b75");
     }
+
 }