@@ -1557,28 +1557,23 @@ public void testCreateCaseWithoutUuid() {
15571557 @ Test
15581558 public void testGetDuplicatesWithReportDateThreshold () {
15591559 RDCF rdcf = creator .createRDCF ();
1560-
1560+ Date now = new Date ();
15611561 //case and person matching for asserts
15621562 PersonDto person = creator .createPerson ("Fname" , "Lname" , (p ) -> {
15631563 p .setBirthdateDD (12 );
15641564 p .setBirthdateMM (3 );
15651565 p .setBirthdateYYYY (1968 );
15661566 });
15671567
1568- Date now = new Date ();
1569-
15701568 CaseDataDto caze = creator .createCase (creator .createUser (rdcf , UserRole .SURVEILLANCE_OFFICER ).toReference (), rdcf , (c ) -> {
15711569 c .setPerson (person .toReference ());
1572- c .setExternalID ("test-ext-id" );
1573- c .setExternalToken ("test-ext-token" );
15741570 c .setDisease (Disease .CORONAVIRUS );
15751571 c .setDistrict (rdcf .district );
1576- c .setReportDate (now );
1572+ c .setReportDate (new Date () );
15771573 });
15781574
1579- // second case matching the first one except for the reporting date
1575+ // case and person matching for some asserts
15801576 PersonDto person2 = creator .createPerson ("Fname" , "Lname" , (p ) -> {
1581- p .setBirthdateDD (12 );
15821577 p .setBirthdateMM (3 );
15831578 p .setBirthdateYYYY (1968 );
15841579 });
@@ -1588,6 +1583,15 @@ public void testGetDuplicatesWithReportDateThreshold() {
15881583 c .setReportDate (new DateTime (now ).minusDays (1 ).toDate ());
15891584 });
15901585
1586+ creator .createCase (creator .createUser (rdcf , UserRole .SURVEILLANCE_OFFICER ).toReference (), rdcf , (c ) -> {
1587+ c .setPerson (creator .createPerson ().toReference ());
1588+ c .setDisease (Disease .CHOLERA );
1589+ });
1590+
1591+ creator .createCase (creator .createUser (rdcf , UserRole .SURVEILLANCE_OFFICER ).toReference (), rdcf , (c ) -> {
1592+ c .setPerson (person .toReference ());
1593+ c .setDisease (Disease .CHOLERA );
1594+ });
15911595
15921596 CasePersonDto casePerson = new CasePersonDto ();
15931597 PersonDto duplicatePerson = PersonDto .build ();
@@ -1598,7 +1602,13 @@ public void testGetDuplicatesWithReportDateThreshold() {
15981602 casePerson .setCaze (duplicateCaze );
15991603 casePerson .setPerson (duplicatePerson );
16001604
1601- List <CasePersonDto > duplicates = getCaseFacade ().getDuplicates (casePerson , 2 );
1605+ List <CasePersonDto > duplicates ;
1606+
1607+ // match by first name and last name
1608+ duplicateCaze .setExternalToken (null );
1609+ duplicatePerson .setFirstName ("Fname" );
1610+ duplicatePerson .setLastName ("Lname" );
1611+ duplicates = getCaseFacade ().getDuplicates (casePerson , 1 );
16021612 MatcherAssert .assertThat (duplicates , hasSize (2 ));
16031613 }
16041614
0 commit comments