Merge pull request #1161 from mozzy11/develop

fix provider menu
I-TECH-UW · Jul 3, 2024 · b598cf6 · b598cf6
2 parents b86043b + 1a210b3
commit b598cf6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/main/java/org/openelisglobal/person/valueholder/Person.java b/src/main/java/org/openelisglobal/person/valueholder/Person.java
@@ -13,6 +13,7 @@
  */
 package org.openelisglobal.person.valueholder;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.HashSet;
 import java.util.Set;
 import javax.validation.constraints.Email;
@@ -70,6 +71,7 @@ public class Person extends BaseObject<String> {
     @Email
     private String email;
 
+    @JsonIgnore
     @AssociationInverseSide(inversePath = @ObjectPath(@PropertyValue(propertyName = "person")))
     private Set<Patient> patients = new HashSet<>(0);
 

diff --git a/src/main/resources/hibernate/hbm/Person.hbm.xml b/src/main/resources/hibernate/hbm/Person.hbm.xml
@@ -61,7 +61,7 @@
         <property name="email" type="java.lang.String">
             <column name="EMAIL" />
         </property>
-        <set name="patients" table="PATIENT" fetch="select" lazy="false">
+        <set name="patients" table="PATIENT" fetch="select" lazy="true">
             <key>
                 <column name="PERSON_ID" precision="10" scale="0" not-null="true"/>
             </key>

diff --git a/src/test/java/org/openelisglobal/person/PersonServiceTest.java b/src/test/java/org/openelisglobal/person/PersonServiceTest.java
@@ -1,6 +1,11 @@
 package org.openelisglobal.person;
 
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Set;
+import javax.transaction.Transactional;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -50,20 +55,34 @@ public void createPerson_shouldCreateNewPerson() throws Exception {
     }
 
     @Test
+    @Transactional
+    @SuppressWarnings("unchecked")
     public void createPersonWithMultiplePatients_shouldLinkPatientsToPerson() throws Exception {
 
         Person person = new Person();
         String personId = personService.insert(person);
         Person savedPerson = personService.get(personId);
 
+        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+        Date date = dateFormat.parse("12/12/1992");
+        long time = date.getTime();
+        Timestamp dob = new Timestamp(time);
+
         Patient patient1 = new Patient();
+        patient1.setPerson(person);
+        patient1.setBirthDate(dob);
+        patient1.setGender("M");
+        String patientId1 = patientService.insert(patient1);
         Patient patient2 = new Patient();
+        patient2.setPerson(person);
+        patient2.setBirthDate(dob);
+        patient2.setGender("M");
+        String patientId2 = patientService.insert(patient2);
+
         savedPerson.addPatient(patient1);
         savedPerson.addPatient(patient2);
-        String patientId1 = patientService.insert(patient1);
-        String patientId2 = patientService.insert(patient2);
 
-        Set<Patient> patients = savedPerson.getPatients();
+        Set<Patient> patients = personService.get(savedPerson.getId()).getPatients();
         Assert.assertEquals(2, patients.size());
         Assert.assertTrue(patients.stream().anyMatch(p -> p.getId().equals(patientId1)));
         Assert.assertTrue(patients.stream().anyMatch(p -> p.getId().equals(patientId2)));