TRUNK-5793: Migrate AllergyReaction from Hibernate mapping XML to ann…

…otations
openmrs · Nov 8, 2024 · 7c19c6c · 7c19c6c
1 parent 5f89ffc
commit 7c19c6c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 36 deletions.
diff --git a/api/src/main/java/org/openmrs/AllergyReaction.java b/api/src/main/java/org/openmrs/AllergyReaction.java
@@ -10,24 +10,49 @@
 package org.openmrs;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 import org.openmrs.util.OpenmrsUtil;
 
+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.Table;
+
 /**
  * Represent allergy reactions
  */
+@Entity
+@Table(name = "allergy_reaction")
 @Audited
 public class AllergyReaction extends BaseOpenmrsObject implements java.io.Serializable{
 
 	public static final long serialVersionUID = 1;
 
-
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "allergy_reaction_id_seq")
+	@GenericGenerator(
+		name = "allergy_reaction_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "allergy_reaction_allergy_reaction_id_seq")
+	)
+	@Column(name = "allergy_reaction_id")
 	private Integer allergyReactionId;
-
+
+	@ManyToOne
+	@JoinColumn(name = "allergy_id", nullable = false)
 	private Allergy allergy;
-
+
+	@ManyToOne
+	@JoinColumn(name = "reaction_concept_id", nullable = false)
 	private Concept reaction;
-
+
+	@Column(name = "reaction_non_coded")
 	private String reactionNonCoded;
 
 	/**

diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
@@ -21,8 +21,7 @@
 		<property name="hibernate.search.model_mapping">org.openmrs.api.db.hibernate.search.LuceneAnalyzerFactory</property>
 
 		<!-- API -->
-
-		<mapping resource="org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml" />
+
 		<mapping resource="org/openmrs/api/db/hibernate/Concept.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAnswer.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml" />

diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.openmrs.Allergy;
+import org.openmrs.AllergyReaction;
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;
 import org.openmrs.ConceptClass;
@@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(AllergyReaction.class)
 			.getMetadataBuilder().build();