TRUNK-4202 Convert Order.orderer to be a Provider

k-joseph · Jan 8, 2014 · e2b4c86 · dkayiwa · Jan 9, 2014 · dkayiwa
1 parent 7ab4014
commit e2b4c86
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/api/src/main/java/org/openmrs/Order.java b/api/src/main/java/org/openmrs/Order.java
@@ -67,7 +67,7 @@ public enum Action {
 
 	private Encounter encounter;
 
-	private User orderer;
+	private Provider orderer;
 
 	private Date dateStopped;
 
@@ -262,14 +262,14 @@ public void setAccessionNumber(String accessionNumber) {
 	/**
 	 * @return Returns the orderer.
 	 */
-	public User getOrderer() {
+	public Provider getOrderer() {
 		return orderer;
 	}
 
 	/**
 	 * @param orderer The orderer to set.
 	 */
-	public void setOrderer(User orderer) {
+	public void setOrderer(Provider orderer) {
 		this.orderer = orderer;
 	}
 

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java
@@ -46,6 +46,7 @@
 import org.openmrs.Program;
 import org.openmrs.ProgramWorkflow;
 import org.openmrs.ProgramWorkflowState;
+import org.openmrs.Provider;
 import org.openmrs.Relationship;
 import org.openmrs.RelationshipType;
 import org.openmrs.User;
@@ -130,13 +131,13 @@ public String exportXml(Cohort ps) throws DAOException {
 		return ret.toString();
 	}
 
-	private String formatUserName(User u) {
-		return u.getPersonName().toString();
+	private String formatProviderName(Provider p) {
+		return p.getPerson().toString();
 	}
 
-	private String formatUser(User u) {
+	private String formatProvider(Provider p) {
 		StringBuilder ret = new StringBuilder();
-		ret.append(u.getUserId() + "^" + formatUserName(u));
+		ret.append(p.getProviderId() + "^" + formatProviderName(p));
 		return ret.toString();
 	}
 
@@ -384,7 +385,7 @@ public String exportXml(Integer patientId) throws DAOException {
 							orderNode.setAttribute("auto_expire_date", df.format(order.getAutoExpireDate()));
 						}
 						if (order.getOrderer() != null) {
-							orderNode.setAttribute("orderer", formatUser(order.getOrderer()));
+							orderNode.setAttribute("orderer", formatProvider(order.getOrderer()));
 						}
 						if (order.getDateStopped() != null) {
 							orderNode.setAttribute("date_stopped", df.format(order.getDateStopped()));

diff --git a/api/src/main/resources/liquibase-update-to-latest.xml b/api/src/main/resources/liquibase-update-to-latest.xml
@@ -6805,5 +6805,31 @@
         <comment>Removing discontinued_by from orders</comment>
         <dropColumn tableName="orders" columnName="discontinued_by" />
 	</changeSet>
+
+	<changeSet id="201401081823-TRUNK-4202" author="k-joseph">
+		<preConditions onFail="MARK_RAN">
+			<columnExists tableName="orders" columnName="orderer" />
+		</preConditions>
+		<comment>Creating provider accounts for all users who have placed
+			orders for patients and have no associated provider accounts
+		</comment>
+		<sql>
+			INSERT INTO provider(person_id, identifier, creator, date_created, retired, uuid)
+			SELECT orders.orderer, CONCAT('providerAccount', SUBSTRING(person.uuid, 5)), 1,
+			CURRENT_TIMESTAMP, false, CONCAT('providerAccount', SUBSTRING(person.uuid, 5))
+			WHERE orders.patient_id IS NOT NULL AND orders.orderer NOT IN (SELECT person_id FROM provider)
+		</sql>
+	</changeSet>
+
+	<changeSet id="201401081850-TRUNK-4202" author="k-joseph">
+		<preConditions onFail="MARK_RAN">
+			<columnExists tableName="provider" columnName="provider_id" />
+		</preConditions>
+		<comment>Migrating data in orders.orderer column to be provider_ids</comment>
+		<sql>
+			UPDATE orders SET orderer = (SELECT provider_id FROM provider WHERE provider_id = orders.orderer)
+			WHERE users.user_id IN (SELECT orders.orderer FROM orders)
+		</sql>
+	</changeSet>
 
 </databaseChangeLog>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
@@ -70,8 +70,8 @@
 			<column name="discontinued_reason" />
 		</many-to-one>
 
-		<!-- bi-directional many-to-one association to User -->
-		<many-to-one name="orderer" class="org.openmrs.User">
+		<!-- bi-directional many-to-one association to Provider -->
+		<many-to-one name="orderer" class="org.openmrs.Provider">
 			<column name="orderer" />
 		</many-to-one>