Skip to content

TRUNK-5852 : Provider Domain - Switching from Hibernate Mappings to Annotations #5553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Debbielou wants to merge 2 commits into
base: master
Choose a base branch
from
+80 −80
Open

TRUNK-5852 : Provider Domain - Switching from Hibernate Mappings to Annotations #5553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7777a7f
TRUNK-5852 Updated Provider from hibernate mapping to annotations
Debbielou Nov 27, 2025
e569649
Updated Provider with cascade types & removed unrequired annotations
Debbielou Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 60 additions & 6 deletions api/src/main/java/org/openmrs/Provider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,75 @@
*/
package org.openmrs;

import jakarta.persistence.Access;
import jakarta.persistence.AccessType;
import jakarta.persistence.AttributeOverride;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import org.hibernate.annotations.BatchSize;
import org.hibernate.envers.Audited;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.HashSet;
import java.util.Set;

/**
* Represents a person who may provide care to a patient during an encounter
*
* @since 1.9
*/
@Entity
@Table(name = "provider")
@Audited
public class Provider extends BaseCustomizableMetadata<ProviderAttribute> {

private static final Logger log = LoggerFactory.getLogger(Provider.class);


@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "provider_id")
private Integer providerId;


@ManyToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
@JoinColumn(name = "person_id")
private Person person;


@Column(name = "name", length = 255)
@Access(AccessType.FIELD)
private String name;

@Column(name = "identifier", length = 255)
private String identifier;


@ManyToOne
@JoinColumn(name = "role_id")
private Concept role;


@ManyToOne
@JoinColumn(name = "speciality_id")
private Concept speciality;

@ManyToOne
@JoinColumn(name = "provider_role_id")
private ProviderRole providerRole;

@OneToMany(mappedBy = "provider", fetch = FetchType.LAZY,
cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE },
orphanRemoval = true)
@JoinColumn(name = "provider_id")
@BatchSize(size = 100)
private Set<ProviderAttribute> attributes = new HashSet<>();

public Provider() {
}
Expand Down Expand Up @@ -68,10 +112,12 @@ public void setProviderId(Integer providerId) {
/**
* @return the providerId
*/


public Integer getProviderId() {
return providerId;
}

/**
* @param person the person to set
*/
Expand Down Expand Up @@ -119,6 +165,14 @@ public void setRole(Concept role) {
public Concept getRole() {
return role;
}

public Set<ProviderAttribute> getAttributes() {
return attributes;
}

public void setAttributes(Set<ProviderAttribute> attributes) {
this.attributes = attributes;
}

/**
* Sets the speciality concept
Expand Down
4 changes: 1 addition & 3 deletions api/src/main/resources/hibernate.cfg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@
<!-- Visit -->
<mapping resource="org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml" />

<!-- Provider -->
<mapping resource="org/openmrs/api/db/hibernate/Provider.hbm.xml" />


<!-- These mappings are required because of references in Obs & Concept -->
<mapping class="org.openmrs.ObsReferenceRange"/>
<mapping class="org.openmrs.ConceptReferenceRange"/>
Expand Down
70 changes: 0 additions & 70 deletions api/src/main/resources/org/openmrs/api/db/hibernate/Provider.hbm.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions api/src/test/java/org/openmrs/api/OrderServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2939,6 +2939,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
.addAnnotatedClass(LoginCredential.class)
.addAnnotatedClass(ConceptDatatype.class)
.addAnnotatedClass(ProviderAttribute.class)
.addAnnotatedClass(Provider.class)
.getMetadataBuilder().build();


Expand Down
19 changes: 18 additions & 1 deletion api/src/test/resources/org/openmrs/api/include/ProviderServiceTest-initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<provider_role provider_role_id="1011" name="Accompagnateur" creator="1" date_created="2005-09-22 00:00:00.0"
retired="true" retired_by="1" date_retired="2005-10-22 00:00:00.0" retire_reason="Unused" uuid="da7f623f-37ce-5bb2-86d6-6d1d05312bd5"/>

<provider provider_id="1" provider_role_id="1001" name="RobertClive" identifier="8A760" creator="1" date_created="2005-01-01 00:00:00.0"
<provider provider_id="1" provider_role_id="1001" name="RobertClive" person_id="1" identifier="8A760" creator="1" date_created="2005-01-01 00:00:00.0"
retired="0" uuid="a2c3868a-6b90-11e0-93c3-18a905e044dc"/>
<provider provider_id="2" provider_role_id="1001" name="Roger" person_id="2" identifier="8A761" creator="1"
date_created="2005-01-01 00:00:00.0" retired="0" uuid="a3a5913e-6b94-11e0-93c3-18a905e044dc"/>
Expand All @@ -46,6 +46,23 @@
date_created="2005-01-01 00:00:00.0" retired="0" uuid="1f9e8336-6b95-11e0-93c3-18a905e044dc"/>
<provider provider_id="9" name="provider8" person_id="2" identifier="8C763" creator="1"
date_created="2005-01-01 00:00:00.0" retired="1" uuid="1f9e8336-6b95-11e0-93c3-18a905e044dn"/>
<person person_id="1" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="M"
uuid="b3a5913e-6b94-11e0-93c3-18a905e044d1"/>
<person person_id="2" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="M"
uuid="a3a5913e-6b94-11e0-93c3-18a905e044d2"/>
<person person_id="6" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="M"
uuid="ae401f88-6b94-11e0-93c3-18a905e044d6"/>
<person person_id="7" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="F"
uuid="ba4781f4-6b94-11e0-93c3-18a905e044d7"/>
<person person_id="8" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="M"
uuid="c7e19142-6b94-11e0-93c3-18a905e044d8"/>
<person person_id="9" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="M"
uuid="0b2056be-6b95-11e0-93c3-18a905e044d9"/>
<person person_id="501" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="F"
uuid="161b3002-6b95-11e0-93c3-18a905e0501a"/>
<person person_id="502" creator="1" date_created="2005-01-01 00:00:00.0" retired="0" gender="M"
uuid="1f9e8336-6b95-11e0-93c3-18a905e0502b"/>

<person_name person_name_id="9352" preferred="true" person_id="2" prefix="Mr." given_name="william" middle_name=""
family_name="williamson" family_name_suffix="Esq." creator="1" date_created="2005-09-22 00:00:00.0"
voided="true" void_reason="changed" uuid="399e3a7b-6482-487d-94ce-c07bb3ca3ccw"/>
Expand Down
Loading