TRUNK-5924: Migrate PatientIdentifier to JPA annotations (#5383)

* TRUNK-5924: Migrate PatientIdentifier to JPA annotations

* TRUNK-5924: Remove redundant mapping for PatientIdentifier and fix build failure

* Update api/src/main/java/org/openmrs/PatientIdentifier.java

Co-authored-by: Manoj Lakshan <[email protected]>

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

Co-authored-by: Manoj Lakshan <[email protected]>

* Remove unused import in PatientIdentifier.java

* TRUNK-5924: Set PatientIdentifier.preferred column as non-nullable

* TRUNK-5924: Align Liquibase schema with nullable constraints

---------

Co-authored-by: Manoj Lakshan <[email protected]>

Author: pidsonn

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

@@ -14,6 +14,14 @@
 import java.lang.reflect.Method;
 import java.util.Comparator;
 
+import jakarta.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.engine.backend.types.Sortable;
@@ -43,6 +51,8 @@
  */
 @Indexed
 @Audited
+@Entity
+@Table(name = "patient_identifier")
 public class PatientIdentifier extends BaseChangeableOpenmrsData implements java.io.Serializable, Cloneable, Comparable<PatientIdentifier> {
 
 	public static final long serialVersionUID = 1123121L;
@@ -55,29 +65,42 @@ public class PatientIdentifier extends BaseChangeableOpenmrsData implements java
 	 * @since 1.5
 	 */
 	@DocumentId
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "patient_identifier_id", nullable = false)
 	private Integer patientIdentifierId;
 
+	@ManyToOne
+	@JoinColumn(name = "patient_id", nullable = false)
 	@IndexedEmbedded(includeEmbeddedObjectId = true)
 	@AssociationInverseSide(inversePath = @ObjectPath({
 		@PropertyValue(propertyName = "identifiers")
 	}))
 	private Patient patient;
-	
+
 	@FullTextField(name = "identifierPhrase", analyzer = SearchAnalysis.PHRASE_ANALYZER)
 	@FullTextField(name = "identifierExact", analyzer = SearchAnalysis.EXACT_ANALYZER)
 	@FullTextField(name = "identifierStart", analyzer = SearchAnalysis.START_ANALYZER, searchAnalyzer = SearchAnalysis.EXACT_ANALYZER)
 	@FullTextField(name = "identifierAnywhere", analyzer = SearchAnalysis.ANYWHERE_ANALYZER, searchAnalyzer = SearchAnalysis.EXACT_ANALYZER)
 	@KeywordField(name = "identifierExact_sort", sortable = Sortable.YES)
+	@Column(name = "identifier", length = 50, nullable = false)
 	private String identifier;
 
+	@ManyToOne
+	@JoinColumn(name = "identifier_type", nullable = false)
 	@IndexedEmbedded(includeEmbeddedObjectId = true)
 	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private PatientIdentifierType identifierType;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "location_id")
 	private Location location;
 
+	@ManyToOne
+	@JoinColumn(name = "patient_program_id")
 	private PatientProgram patientProgram;
 
+	@Column(name = "preferred", nullable = false)
 	@GenericField
 	private Boolean preferred = false;
 

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

@@ -39,7 +39,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/PersonName.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Role.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Patient.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/RelationshipType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Order.hbm.xml" />

api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml

@@ -62,6 +62,7 @@
 import org.openmrs.OrderSet;
 import org.openmrs.OrderType;
 import org.openmrs.Patient;
+import org.openmrs.PatientIdentifier;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.PatientProgram;
 import org.openmrs.PatientState;
@@ -2855,6 +2856,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 				.addAnnotatedClass(DrugReferenceMap.class)
 				.addAnnotatedClass(AlertRecipient.class)
 				.addAnnotatedClass(PatientIdentifierType.class)
+			    .addAnnotatedClass(PatientIdentifier.class)
 				.addAnnotatedClass(ProgramAttributeType.class)
 				.addAnnotatedClass(HL7InError.class)
 				.addAnnotatedClass(OrderType.class)