TRUNK-6238: Drug Ingredients - Switching from Hibernate Mapping to JP…

…A annotations (openmrs#4644)
wikumChamith · Jun 1, 2024 · 4b5f83f · 4b5f83f
1 parent f57b1d6
commit 4b5f83f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 54 deletions.
diff --git a/api/src/main/java/org/openmrs/DrugIngredient.java b/api/src/main/java/org/openmrs/DrugIngredient.java
@@ -9,21 +9,40 @@
  */
 package org.openmrs;
 
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import java.io.Serializable;
+
 /**
  * DrugIngredient
  */
-public class DrugIngredient extends BaseOpenmrsObject implements java.io.Serializable, OpenmrsObject {
+@Entity
+@Table(name = "drug_ingredient")
+public class DrugIngredient extends BaseOpenmrsObject implements Serializable, OpenmrsObject {
 
 	public static final long serialVersionUID = 94023L;
 
 	// Fields
-
+	@ManyToOne
+	@JoinColumn(name = "drug_id", updatable = false, insertable = false)
+	@Id
 	private Drug drug;
-
+
+	@ManyToOne
+	@JoinColumn(name = "ingredient_id", updatable = false, insertable = false)
+	@Id
 	private Concept ingredient;
-
+
+	@Column(name = "strength")
 	private Double strength;
 
+	@JoinColumn(name = "units", insertable = false, updatable = false)
+	@ManyToOne
 	private Concept units;
 
 	// Constructors
@@ -33,7 +52,6 @@ public DrugIngredient() {
 	}
 
 	// Property accessors
-
 	/**
 	 * @return the drug
 	 */

diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
@@ -43,7 +43,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Drug.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/DrugIngredient.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Field.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />

diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/DrugIngredient.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/DrugIngredient.hbm.xml
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+
 import org.openmrs.Allergy;
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;
@@ -31,6 +32,7 @@
 import org.openmrs.Condition;
 import org.openmrs.Diagnosis;
 import org.openmrs.Drug;
+import org.openmrs.DrugIngredient;
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
 import org.openmrs.FreeTextDosingInstructions;
@@ -2665,6 +2667,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(LocationAttributeType.class)
 			.addAnnotatedClass(SerializedObject.class)
 			.addAnnotatedClass(PatientState.class)
+			.addAnnotatedClass(DrugIngredient.class)
 			.addAnnotatedClass(AlertRecipient.class)
 			.getMetadataBuilder().build();