TRUNK-5495 Replace Visit hbm mapping file with annotations (#2909)

openmrs · May 29, 2019 · f9ba0d0 · f9ba0d0
1 parent a7f793d
commit f9ba0d0
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 93 deletions.
diff --git a/api/src/main/java/org/openmrs/Visit.java b/api/src/main/java/org/openmrs/Visit.java
@@ -11,10 +11,26 @@
 
 import java.util.Date;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+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.annotations.BatchSize;
 import org.openmrs.customdatatype.Customizable;
 
 /**
@@ -23,25 +39,47 @@
  * 
  * @since 1.9
  */
-
+@Entity
+@Table(name = "visit")
 public class Visit extends BaseCustomizableData<VisitAttribute> implements Auditable, Customizable<VisitAttribute> {
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "visit_id")
 	private Integer visitId;
 
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "patient_id")
 	private Patient patient;
 
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "visit_type_id")
 	private VisitType visitType;
 
+	@ManyToOne
+	@JoinColumn(name = "indication_concept_id")
 	private Concept indication;
 
+	@ManyToOne
+	@JoinColumn(name = "location_id")
 	private Location location;
 
+	@Column(name = "date_started", nullable = false, length = 19)
 	private Date startDatetime;
 
+	@Column(name = "date_stopped", length = 19)
 	private Date stopDatetime;
 
+	@OneToMany(mappedBy = "visit")
+	@OrderBy("encounter_datetime desc, encounter_id desc")
 	private Set<Encounter> encounters;
 
+	@Access(AccessType.PROPERTY)
+	@OneToMany(mappedBy = "visit", cascade = CascadeType.ALL, orphanRemoval = true)
+	@OrderBy("voided asc")
+	@BatchSize(size = 100)
+	private Set<VisitAttribute> attributes = new LinkedHashSet<>();
+
 	/**
 	 * Default Constructor
 	 */

diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
@@ -110,7 +110,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/VisitType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/VisitAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/Visit.hbm.xml" />
 
 		<!-- Provider -->
 		<mapping resource="org/openmrs/api/db/hibernate/Provider.hbm.xml" />

diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Visit.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Visit.hbm.xml
diff --git a/api/src/test/java/org/openmrs/api/VisitServiceTest.java b/api/src/test/java/org/openmrs/api/VisitServiceTest.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.TransientObjectException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -938,21 +937,25 @@ public void saveVisit_shouldAssociateEncounterWithVisitOnSaveEncounter() {
 	/**
 	 * @see VisitService#saveVisit(Visit)
 	 */
-	@Test(expected = TransientObjectException.class)
+	@Test
 	public void saveVisit_shouldNotPersistNewEncounter() {
-		
+
 		Visit visit = visitService.getVisit(1);
-
+		EncounterService es = Context.getEncounterService();
+		final int originalCount = es.getEncountersByPatient(visit.getPatient()).size();
+
 		Encounter encounter = new Encounter();
 		encounter.setEncounterDatetime(new Date());
-		encounter.setEncounterType(Context.getEncounterService().getEncounterType(1));
+		encounter.setEncounterType(es.getEncounterType(1));
 		encounter.setPatient(visit.getPatient());
 		encounter.setLocation(visit.getLocation());
 		visit.addEncounter(encounter);
-		
+
 		visitService.saveVisit(visit);
 
 		Context.flushSession();
+		assertNull(encounter.getEncounterId());
+		assertEquals(originalCount, es.getEncountersByPatient(visit.getPatient()).size());
 	}
 
 	/**