Changing order number incrementing strategy from memory to database for:

The API should assign order numbers to new orders - TRUNK-4163
openmrs · Dec 16, 2013 · b66bc5c · wluyima · Dec 17, 2013 · wluyima
1 parent 985baae
commit b66bc5c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/api/src/main/java/org/openmrs/api/db/OrderDAO.java b/api/src/main/java/org/openmrs/api/db/OrderDAO.java
@@ -103,10 +103,4 @@ public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<P
 	 * Delete Obs that references an order
 	 */
 	public void deleteObsThatReference(Order order);
-
-	/**
-	 * @return the highest orderId that has been persisted to the database
-	 * @should return the highest order id
-	 */
-	public Integer getHighestOrderId();
 }
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
@@ -18,7 +18,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
-import org.hibernate.Query;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Expression;
 import org.openmrs.Concept;
@@ -203,13 +202,4 @@ public void deleteObsThatReference(Order order) {
 			        .executeUpdate();
 		}
 	}
-
-	/**
-	 * @see org.openmrs.api.db.OrderDAO#getHighestOrderId()
-	 */
-	@Override
-	public Integer getHighestOrderId() {
-		Query query = sessionFactory.getCurrentSession().createSQLQuery("SELECT max(order_id) FROM orders");
-		return (Integer) query.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
@@ -27,6 +27,7 @@
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
 import org.openmrs.EncounterType;
+import org.openmrs.GlobalProperty;
 import org.openmrs.Location;
 import org.openmrs.Order;
 import org.openmrs.OrderType;
@@ -42,6 +43,8 @@
 import org.openmrs.order.DrugOrderSupport;
 import org.openmrs.order.OrderUtil;
 import org.openmrs.order.RegimenSuggestion;
+import org.openmrs.util.OpenmrsConstants;
+import org.openmrs.util.PrivilegeConstants;
 import org.springframework.util.StringUtils;
 
 /**
@@ -58,8 +61,6 @@ public class OrderServiceImpl extends BaseOpenmrsService implements OrderService
 
 	protected OrderDAO dao;
 
-	private static Integer orderNumberCounter = -1;
-
 	public OrderServiceImpl() {
 	}
 
@@ -628,12 +629,20 @@ public List<Order> getOrdersByEncounter(Encounter encounter) {
 	 */
 	@Override
 	public synchronized String getNewOrderNumber() {
-		if (orderNumberCounter < 0) {
-			// we've just started up, so we need to fetch this from the DAO
-			Integer temp = dao.getHighestOrderId();
-			orderNumberCounter = temp == null ? 0 : temp;
+		GlobalProperty globalProperty = Context.getAdministrationService().getGlobalPropertyObject(
+		    OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER);
+		if (globalProperty == null) {
+			globalProperty = new GlobalProperty(OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER, "1",
+			        "The next order number available for assignment");
 		}
-		orderNumberCounter += 1;
-		return "ORD-" + orderNumberCounter;
+
+		String orderNumber = "ORD-" + globalProperty.getValue();
+
+		globalProperty.setPropertyValue(String.valueOf(Long.parseLong(globalProperty.getPropertyValue()) + 1));
+		Context.addProxyPrivilege(PrivilegeConstants.MANAGE_GLOBAL_PROPERTIES);
+		Context.getAdministrationService().saveGlobalProperty(globalProperty);
+		Context.removeProxyPrivilege(PrivilegeConstants.MANAGE_GLOBAL_PROPERTIES);
+
+		return orderNumber;
 	}
 }
diff --git a/api/src/main/java/org/openmrs/util/OpenmrsConstants.java b/api/src/main/java/org/openmrs/util/OpenmrsConstants.java
@@ -1050,6 +1050,8 @@ public static final Collection<String> AUTO_ROLES() {
 
 	public static final String GP_CASE_SENSITIVE_NAMES_IN_CONCEPT_NAME_TABLE = "concept.caseSensitiveNamesInConceptNameTable";
 
+	public static final String GLOBAL_PROPERTY_NEXT_ORDER_NUMBER = "orderEntry.nextOrderNumber";
+
 	/**
 	 * At OpenMRS startup these global properties/default values/descriptions are inserted into the
 	 * database if they do not exist yet.
@@ -1475,6 +1477,9 @@ public static final List<GlobalProperty> CORE_GLOBAL_PROPERTIES() {
 		props.add(new GlobalProperty(GLOBAL_PROPERTY_USER_REQUIRE_EMAIL_AS_USERNAME, "false",
 		        "Indicates whether a username must be a valid e-mail or not.", BooleanDatatype.class, null));
 
+		props.add(new GlobalProperty(GLOBAL_PROPERTY_NEXT_ORDER_NUMBER, "1",
+		        "The next order number available for assignment"));
+
 		for (GlobalProperty gp : ModuleFactory.getGlobalProperties()) {
 			props.add(gp);
 		}