Skip to content
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

TRUNK-5828 : EncounterRole Domain - Switching from Hibernate Mappings to Annotations #4859

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

TRUNK-5828 : EncounterRole Domain - Switching from Hibernate Mappings to Annotations #4859

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c664b0
TRUNK-5828 : EncounterRole Domain - Switching from Hibernate Mappings…
rishabhrawat05 Dec 4, 2024
266e20e
TRUNK-5828 : Update EncounterRole class
rishabhrawat05 Dec 4, 2024
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
18 changes: 18 additions & 0 deletions api/src/main/java/org/openmrs/EncounterRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,37 @@
package org.openmrs;

import org.hibernate.envers.Audited;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Parameter;

/**
* An EncounterRole a role specific to the encounter. While these could match up to existing
* organizational roles (e.g., "Nurse"), they don't have to (e.g., "Lead Surgeon")
*
* @since 1.9
*/
@Entity
@Table(name = "encounter_role")
rishabhrawat05 marked this conversation as resolved.
Show resolved Hide resolved
@Audited
public class EncounterRole extends BaseChangeableOpenmrsMetadata {

public static final String UNKNOWN_ENCOUNTER_ROLE_UUID = "a0b03050-c99b-11e0-9572-0800200c9a66";

// Fields
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "encounter_role_id_seq")
@GenericGenerator(
name = "encounter_role_id_seq",
strategy = "native",
parameters = @Parameter(name = "sequence", value = "encounter_role_encounter_role_id_seq")
)
@Column(name = "encounter_role_id", nullable = false)
private Integer encounterRoleId;

// Constructors
Expand Down
1 change: 0 additions & 1 deletion api/src/main/resources/hibernate.cfg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<mapping resource="org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/EncounterType.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/EncounterRole.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/Program.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml" />
Expand Down
51 changes: 0 additions & 51 deletions api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 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 @@ -35,6 +35,7 @@
import org.openmrs.DrugIngredient;
import org.openmrs.DrugOrder;
import org.openmrs.Encounter;
import org.openmrs.EncounterRole;
import org.openmrs.FreeTextDosingInstructions;
import org.openmrs.GlobalProperty;
import org.openmrs.Location;
Expand Down Expand Up @@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
.addAnnotatedClass(ProgramAttributeType.class)
.addAnnotatedClass(HL7InError.class)
.addAnnotatedClass(OrderType.class)
.addAnnotatedClass(EncounterRole.class)
.getMetadataBuilder().build();


Expand Down