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-5837: Migrate Cohort Domain from Hibernate Mapping XML to JPA annotations. #4892

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

TRUNK-5837: Migrate Cohort Domain from Hibernate Mapping XML to JPA annotations. #4892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ac6eab
Update the cohort.java file
dilankavishka Jan 20, 2025
7e782ca
Update the hibernate.cfg.xml file
dilankavishka Jan 20, 2025
a382fb6
Remove the Cohort.hbm.xml file
dilankavishka Jan 20, 2025
f984bdd
made the changes for test files
dilankavishka Jan 20, 2025
28e3962
update the Cohort.java file
dilankavishka Jan 20, 2025
797cb9f
update the CohortServiceTest.java file
dilankavishka Jan 20, 2025
4b477fd
Update the Cohort.java file
dilankavishka Jan 21, 2025
5209a9f
method changes reverted
dilankavishka Feb 9, 2025
f0acb37
reverted changes on comments
dilankavishka Feb 11, 2025
bd0d5ce
remove the Set import in CohortServiceTest.java file
dilankavishka Feb 12, 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
25 changes: 24 additions & 1 deletion api/src/main/java/org/openmrs/Cohort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,18 @@
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 javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
Expand All @@ -22,17 +32,30 @@
/**
* This class represents a list of patientIds.
*/
@Entity
@Table(name = "cohort")
@Audited
public class Cohort extends BaseChangeableOpenmrsData {

public static final long serialVersionUID = 0L;

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY, generator = "cohort_id_seq")
@GenericGenerator(
name = "cohort_id_seq",
strategy = "native",
parameters = @Parameter(name = "sequence", value = "cohort_cohort_id_seq")
)
@Column(name = "cohort_id", nullable = false)
private Integer cohortId;

@Column(name = "name", nullable = false)
private String name;

@Column(name = "description", nullable = false)
private String description;

@OneToMany(mappedBy = "cohort", cascade = CascadeType.ALL, orphanRemoval = true)
private Collection<CohortMembership> memberships;

public Cohort() {
Expand Down Expand Up @@ -349,7 +372,7 @@ public void setMemberIds(Set<Integer> memberIds) {
}

public void setMemberships(Collection<CohortMembership> members) {
this.memberships = members;
this.memberships = members;
}

/**
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 @@ -82,7 +82,6 @@
<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" />
<mapping resource="org/openmrs/api/db/hibernate/Cohort.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/CohortMembership.hbm.xml"/>
<mapping resource="org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml" />

Expand Down
55 changes: 0 additions & 55 deletions api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/test/java/org/openmrs/CohortTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void constructorWithCommaSeparatedIntegers_shouldAddMembersToCohort() {
@Test
public void getCommaSeparatedPatientIds_shouldReturnCommaSeparatedListOfPatients() {

List<Patient> patients = new ArrayList<>();
Set<Patient> patients = new HashSet<>();
Arrays.stream(ids).forEach(id -> patients.add(new Patient(id)));

Cohort cohort = new Cohort("name", "description", patients);
Expand Down
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 @@ -21,6 +21,7 @@

import org.openmrs.Allergy;
import org.openmrs.CareSetting;
import org.openmrs.Cohort;
import org.openmrs.Concept;
import org.openmrs.ConceptClass;
import org.openmrs.ConceptDatatype;
Expand Down Expand Up @@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
.addAnnotatedClass(ProgramAttributeType.class)
.addAnnotatedClass(HL7InError.class)
.addAnnotatedClass(OrderType.class)
.addAnnotatedClass(Cohort.class)
.getMetadataBuilder().build();


Expand Down
Loading