Fixed failing test because of hanging code in OrderService.getNewOrderNumber - TRUNK-4183

wluyima · wluyima · commit c4052b58a290 · 2014-02-08T22:15:42.000-05:00
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
@@ -16,19 +16,17 @@
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
-import org.hibernate.LockMode;
+import org.hibernate.Query;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Disjunction;
 import org.hibernate.criterion.Restrictions;
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;
 import org.openmrs.Encounter;
-import org.openmrs.GlobalProperty;
 import org.openmrs.Order;
 import org.openmrs.Order.Action;
 import org.openmrs.OrderFrequency;
@@ -162,34 +160,28 @@ public Order getOrderByOrderNumber(String orderNumber) {
 	 */
 	@Override
 	public Long getNextOrderNumberSeedSequenceValue() {
-		Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(GlobalProperty.class);
-		searchCriteria.add(Restrictions.eq("property", OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED));
-		searchCriteria.setLockMode(LockMode.PESSIMISTIC_WRITE);
+		Query query = sessionFactory.getCurrentSession().createSQLQuery(
+		    "select property_value from  global_property where property = '"
+		            + OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED + "' for update");
 		
-		GlobalProperty globalProperty = (GlobalProperty) searchCriteria.uniqueResult();
-		if (globalProperty == null) {
+		List results = query.list();
+		if (results.size() == 0) {
 			throw new APIException("Missing global property named: "
 			        + OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED);
 		}
 		
-		String gpTextValue = globalProperty.getPropertyValue();
-		if (StringUtils.isBlank(gpTextValue)) {
-			throw new APIException("Invalid value for global property named: "
-			        + OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED);
-		}
-		
 		Long gpNumericValue = null;
 		try {
-			gpNumericValue = Long.parseLong(gpTextValue);
+			gpNumericValue = Long.parseLong(results.get(0).toString());
 		}
 		catch (NumberFormatException ex) {
 			throw new APIException("Invalid value for global property named: "
 			        + OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED);
 		}
 		
-		globalProperty.setPropertyValue(String.valueOf(gpNumericValue + 1));
-		
-		sessionFactory.getCurrentSession().save(globalProperty);
+		sessionFactory.getCurrentSession().createSQLQuery(
+		    "update global_property set property_value = '" + String.valueOf(gpNumericValue + 1) + "' where property = '"
+		            + OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED + "'").executeUpdate();
 		
 		return gpNumericValue;
 	}
diff --git a/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
@@ -258,7 +258,7 @@ public Order getOrderByUuid(String uuid) throws APIException {
 	 * @see org.openmrs.api.OrderNumberGenerator#getNewOrderNumber()
 	 */
 	@Override
-	public synchronized String getNewOrderNumber() {
+	public String getNewOrderNumber() {
 		return ORDER_NUMBER_PREFIX + Context.getOrderService().getNextOrderNumberSeedSequenceValue();
 	}
 	
@@ -295,7 +295,7 @@ public List<Order> getOrderHistoryByConcept(Patient patient, Concept concept) {
 	 */
 	@Override
 	@Transactional(propagation = Propagation.REQUIRES_NEW)
-	public Long getNextOrderNumberSeedSequenceValue() {
+	public synchronized Long getNextOrderNumberSeedSequenceValue() {
 		return dao.getNextOrderNumberSeedSequenceValue();
 	}
 	
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -29,7 +29,6 @@
 
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;
@@ -132,7 +131,6 @@ public void purgeOrder_shouldDeleteObsThatReference() throws Exception {
 	 * @see {@link OrderNumberGenerator#getNewOrderNumber()}
 	 */
 	@Test
-	@Ignore
 	@Verifies(value = "should always return unique orderNumbers when called multiple times without saving orders", method = "getNewOrderNumber()")
 	public void getNewOrderNumber_shouldAlwaysReturnUniqueOrderNumbersWhenCalledMultipleTimesWithoutSavingOrders()
 	        throws Exception {
