TRUNK-5842-ProgramWorkflow-Domain-Switching-from-Hibernate-Mappings to annotations

api/src/main/java/org/openmrs/ProgramWorkflow.java

@@ -11,34 +11,85 @@
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
-
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
 import org.hibernate.envers.Audited;
 import org.openmrs.util.NaturalStrings;
 
 /**
  * ProgramWorkflow
  */
+@Entity
+@Table(name = "program_workflow")
 @Audited
-public class ProgramWorkflow extends BaseChangeableOpenmrsMetadata {
+public class ProgramWorkflow extends BaseOpenmrsObject {
 
 	private static final long serialVersionUID = 1L;
 
 	// ******************
 	// Properties
 	// ******************
-
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "program_workflow_program_workflow_id_seq")
+    @Column(name = "program_workflow_id")
 	private Integer programWorkflowId;
 
-	private Program program;
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "program_id", nullable = false)
+    private Program program;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "concept_id", nullable = false)
+    private Concept concept;
+
+	@OneToMany(mappedBy = "programWorkflow", cascade = CascadeType.ALL, orphanRemoval = true,  fetch = FetchType.EAGER)
+    @OrderBy("dateCreated ASC")
+    private Set<ProgramWorkflowState> states = new HashSet<>();
+
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "creator")
+	private User creator;
+
+	@Column(name = "date_created", nullable = false)
+	private Date dateCreated;
+
+	@ManyToOne
+	@JoinColumn(name = "changed_by")
+	private User changedBy;
+
+	@Column(name = "date_changed")
+	private Date dateChanged;
+
+	@Column(name = "retired", nullable = false)
+	@org.hibernate.search.annotations.Field
+	private Boolean retired = Boolean.FALSE;
+
+	@Column(name = "date_retired")
+	private Date dateRetired;
+
+	@ManyToOne
+	@JoinColumn(name = "retired_by")
+	private User retiredBy;
 
-	private Concept concept;
+	@Column(name = "retire_reason", length = 255)
+	private String retireReason;
 
-	private Set<ProgramWorkflowState> states = new HashSet<>();
 
 	// ******************
 	// Constructors
@@ -292,6 +343,70 @@ public void setId(Integer id) {
 
 	}
 
+	public User getCreator() {
+		return creator;
+	}
+
+	public void setCreator(User creator) {
+		this.creator = creator;
+	}
+
+	public Date getDateCreated() {
+		return dateCreated;
+	}
+
+	public void setDateCreated(Date dateCreated) {
+		this.dateCreated = dateCreated;
+	}
+
+	public User getChangedBy() {
+		return changedBy;
+	}
+
+	public void setChangedBy(User changedBy) {
+		this.changedBy = changedBy;
+	}
+
+	public Date getDateChanged() {
+		return dateChanged;
+	}
+
+	public void setDateChanged(Date dateChanged) {
+		this.dateChanged = dateChanged;
+	}
+
+	public Boolean getRetired() {
+		return retired;
+	}
+
+	public void setRetired(Boolean retired) {
+		this.retired = retired;
+	}
+
+	public Date getDateRetired() {
+		return dateRetired;
+	}
+
+	public void setDateRetired(Date dateRetired) {
+		this.dateRetired = dateRetired;
+	}
+
+	public User getRetiredBy() {
+		return retiredBy;
+	}
+
+	public void setRetiredBy(User retiredBy) {
+		this.retiredBy = retiredBy;
+	}
+
+	public String getRetireReason() {
+		return retireReason;
+	}
+
+	public void setRetireReason(String retireReason) {
+		this.retireReason = retireReason;
+	}
+
 	/**
 	 * Gets the number of states which are not retired
 	 * 

api/src/main/java/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java

@@ -70,6 +70,7 @@ public void setProgramWorkflowDAO(ProgramWorkflowDAO dao) {
 	 * @see org.openmrs.api.ProgramWorkflowService#saveProgram(org.openmrs.Program)
 	 */
 	@Override
+	@Transactional
 	public Program saveProgram(Program program) throws APIException {
 		// Program
 		if (program.getConcept() == null) {

api/src/main/resources/hibernate.cfg.xml

@@ -77,10 +77,9 @@
 		<mapping resource="org/openmrs/api/db/hibernate/LocationTag.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/EncounterType.hbm.xml" />
-        <mapping resource="org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml" />
+		<mapping resource="org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/EncounterRole.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Program.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Cohort.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/CohortMembership.hbm.xml"/>
@@ -109,6 +108,7 @@
 		<mapping resource="org/openmrs/api/db/hibernate/ClobDatatypeStorage.hbm.xml" />
 
 		<!-- These mappings are required because of rerefences in Obs & Concept -->
+		<mapping class="org.openmrs.ProgramWorkflow"/>
 		<mapping class="org.openmrs.ObsReferenceRange"/>
 		<mapping class="org.openmrs.ConceptReferenceRange"/>
   </session-factory>

api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java

@@ -389,7 +389,6 @@ public void savePatientProgram_shouldSetEndDateOfAllRecentStatesOnTransitionToTe
 	 */
 	@Test
 	public void saveProgram_shouldCreateProgramWorkflows() {
-
 		int numBefore = Context.getProgramWorkflowService().getAllPrograms().size();
 
 		Program program = new Program();
@@ -1114,4 +1113,4 @@ public void triggerStateConversion_shouldTestTransitionToState(){
 	//    	return props;
 	//    }
 
-}
+}