Merge branch 'gg_20201105-remove-person-references' of github.com:jamesagnew/hapi-fhir into gg_20201105-remove-person-references
This commit is contained in:
Tadgh
commit
687e24fa83
|
|
@ -60,8 +60,7 @@ public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc {
|
|||
public IAnyResource mergeGoldenResources(IAnyResource theFromGoldenResource, IAnyResource theToGoldenResource, MdmTransactionContext theMdmTransactionContext) {
|
||||
Long toGoldenResourcePid = myIdHelperService.getPidOrThrowException(theToGoldenResource);
|
||||
|
||||
// TODO NG - Revisit when merge rules are defined
|
||||
// myPersonHelper.mergeFields(theFrom, theTo);
|
||||
myPersonHelper.mergeFields(theFrom, theTo);
|
||||
|
||||
mergeSourceResourceLinks(theFromGoldenResource, theToGoldenResource, toGoldenResourcePid, theMdmTransactionContext);
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import ca.uhn.fhir.rest.api.server.IBundleProvider;
|
|||
import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
|
||||
import ca.uhn.fhir.rest.param.TokenParam;
|
||||
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.hamcrest.Matcher;
|
||||
import org.hl7.fhir.instance.model.api.IAnyResource;
|
||||
import org.hl7.fhir.instance.model.api.IBaseResource;
|
||||
|
|
@ -138,12 +139,12 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
|
|||
|
||||
@Nonnull
|
||||
protected Patient createUnmanagedSourceResource() {
|
||||
return createSourceResourcePatient(new Patient(), false);
|
||||
return createGoldenPatient(new Patient(), false);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
protected Patient createSourceResourcePatient() {
|
||||
return createSourceResourcePatient(new Patient(), true);
|
||||
protected Patient createGoldenPatient() {
|
||||
return createGoldenPatient(new Patient(), true);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
|
@ -152,17 +153,17 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
|
|||
}
|
||||
|
||||
@Nonnull
|
||||
protected Patient createSourceResourcePatient(Patient theSourceResourcePatient) {
|
||||
return createSourceResourcePatient(theSourceResourcePatient, true);
|
||||
protected Patient createGoldenPatient(Patient thePatient) {
|
||||
return createGoldenPatient(thePatient, true);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
protected Patient createSourceResourcePatient(Patient theSourceResourcePatient, boolean theEmpiManaged) {
|
||||
protected Patient createGoldenPatient(Patient thePatient, boolean theEmpiManaged) {
|
||||
if (theEmpiManaged) {
|
||||
theSourceResourcePatient.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_EMPI_MANAGED).setCode(EmpiConstants.CODE_HAPI_EMPI_MANAGED);
|
||||
theSourceResourcePatient.setActive(true);
|
||||
thePatient.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_EMPI_MANAGED).setCode(EmpiConstants.CODE_HAPI_EMPI_MANAGED);
|
||||
thePatient.setActive(true);
|
||||
}
|
||||
DaoMethodOutcome outcome = myPatientDao.create(theSourceResourcePatient);
|
||||
DaoMethodOutcome outcome = myPatientDao.create(thePatient);
|
||||
Patient patient = (Patient) outcome.getResource();
|
||||
patient.setId(outcome.getId());
|
||||
return patient;
|
||||
|
|
@ -392,23 +393,23 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
|
|||
}
|
||||
|
||||
protected Patient getOnlyActiveSourcePatient() {
|
||||
List<IBaseResource> resources = getAllActiveSourcePatients();
|
||||
List<IBaseResource> resources = getAllActiveGoldenPatients();
|
||||
assertEquals(1, resources.size());
|
||||
return (Patient) resources.get(0);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
protected List<IBaseResource> getAllActiveSourcePatients() {
|
||||
return getAllSourcePatients(true);
|
||||
protected List<IBaseResource> getAllActiveGoldenPatients() {
|
||||
return getAllGoldenPatients(true);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
protected List<IBaseResource> getAllSourcePatients() {
|
||||
return getAllSourcePatients(false);
|
||||
protected List<IBaseResource> getAllGoldenPatients() {
|
||||
return getAllGoldenPatients(false);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
private List<IBaseResource> getAllSourcePatients(boolean theOnlyActive) {
|
||||
private List<IBaseResource> getAllGoldenPatients(boolean theOnlyActive) {
|
||||
SearchParameterMap map = new SearchParameterMap();
|
||||
map.setLoadSynchronous(true);
|
||||
//TODO GGG ensure that this tag search works effectively.
|
||||
|
|
@ -422,7 +423,7 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
|
|||
|
||||
@Nonnull
|
||||
protected EmpiLink createResourcesAndBuildTestEmpiLink() {
|
||||
Patient sourcePatient = createSourceResourcePatient();
|
||||
Patient sourcePatient = createGoldenPatient();
|
||||
Patient patient = createPatient();
|
||||
|
||||
EmpiLink empiLink = myEmpiLinkDaoSvc.newEmpiLink();
|
||||
|
|
@ -467,10 +468,18 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
|
|||
}
|
||||
|
||||
|
||||
protected void print(IBaseResource ... theResource) {
|
||||
for (IBaseResource r : theResource) {
|
||||
System.out.println(myFhirContext.newJsonParser().encodeResourceToString(r));
|
||||
protected void print(String message, IBaseResource ... theResource) {
|
||||
if (StringUtils.isNotEmpty(message)) {
|
||||
ourLog.info(message);
|
||||
}
|
||||
|
||||
for (IBaseResource r : theResource) {
|
||||
ourLog.info(myFhirContext.newJsonParser().encodeResourceToString(r));
|
||||
}
|
||||
}
|
||||
|
||||
protected void print(IBaseResource ... theResource) {
|
||||
print(null, theResource);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -486,7 +495,7 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
|
|||
|
||||
protected void printLinks() {
|
||||
myEmpiLinkDao.findAll().forEach(empiLink -> {
|
||||
System.out.println(empiLink);
|
||||
ourLog.info(String.valueOf(empiLink));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
|
|||
super.before();
|
||||
super.loadEmpiSearchParameters();
|
||||
|
||||
myFromSourcePatient = createSourceResourcePatient();
|
||||
myFromSourcePatient = createGoldenPatient();
|
||||
myFromSourcePatientId = new StringType(myFromSourcePatient.getIdElement().getValue());
|
||||
myToSourcePatient = createSourceResourcePatient();
|
||||
myToSourcePatient = createGoldenPatient();
|
||||
myToSourcePatientId = new StringType(myToSourcePatient.getIdElement().getValue());
|
||||
}
|
||||
|
||||
|
|
@ -44,8 +44,8 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
|
|||
assertEquals(myToSourcePatient.getIdElement(), mergedSourcePatient.getIdElement());
|
||||
// TODO GGG RP FIX
|
||||
//assertThat(mergedSourcePatient, is(sameSourceResourceAs(myToSourcePatient)));
|
||||
assertEquals(2, getAllSourcePatients().size());
|
||||
assertEquals(1, getAllActiveSourcePatients().size());
|
||||
assertEquals(2, getAllGoldenPatients().size());
|
||||
assertEquals(1, getAllActiveGoldenPatients().size());
|
||||
|
||||
Patient fromSourcePatient = myPatientDao.read(myFromSourcePatient.getIdElement().toUnqualifiedVersionless());
|
||||
assertThat(fromSourcePatient.getActive(), is(false));
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ public class EmpiProviderQueryLinkR4Test extends BaseLinkR4Test {
|
|||
|
||||
// Add a possible duplicate
|
||||
myLinkSource = new StringType(EmpiLinkSourceEnum.AUTO.name());
|
||||
Patient sourcePatient1 = createSourceResourcePatient();
|
||||
Patient sourcePatient1 = createGoldenPatient();
|
||||
myPerson1Id = new StringType(sourcePatient1.getIdElement().toVersionless().getValue());
|
||||
Long sourcePatient1Pid = myIdHelperService.getPidOrNull(sourcePatient1);
|
||||
Patient sourcePatient2 = createSourceResourcePatient();
|
||||
Patient sourcePatient2 = createGoldenPatient();
|
||||
myPerson2Id = new StringType(sourcePatient2.getIdElement().toVersionless().getValue());
|
||||
Long sourcePatient2Pid = myIdHelperService.getPidOrNull(sourcePatient2);
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
|
|||
@Test
|
||||
public void testCreateRemoveLink() {
|
||||
assertLinkCount(0);
|
||||
Patient sourcePatient = createSourceResourcePatient();
|
||||
Patient sourcePatient = createGoldenPatient();
|
||||
IdType sourcePatientId = sourcePatient.getIdElement().toUnqualifiedVersionless();
|
||||
assertEquals(0, sourcePatient.getLink().size());
|
||||
Patient patient = createPatient();
|
||||
|
|
@ -70,8 +70,8 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
|
|||
@Test
|
||||
public void testPossibleDuplicate() {
|
||||
assertLinkCount(0);
|
||||
Patient sourcePatient1 = createSourceResourcePatient();
|
||||
Patient sourcePatient2 = createSourceResourcePatient();
|
||||
Patient sourcePatient1 = createGoldenPatient();
|
||||
Patient sourcePatient2 = createGoldenPatient();
|
||||
// TODO GGG MDM NOT VALID
|
||||
myEmpiLinkSvc.updateLink(sourcePatient1, sourcePatient2, EmpiMatchOutcome.POSSIBLE_DUPLICATE, EmpiLinkSourceEnum.AUTO, createContextForCreate("Patient"));
|
||||
assertLinkCount(1);
|
||||
|
|
@ -80,8 +80,8 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
|
|||
@Test
|
||||
public void testNoMatchBlocksPossibleDuplicate() {
|
||||
assertLinkCount(0);
|
||||
Patient sourcePatient1 = createSourceResourcePatient();
|
||||
Patient sourcePatient2 = createSourceResourcePatient();
|
||||
Patient sourcePatient1 = createGoldenPatient();
|
||||
Patient sourcePatient2 = createGoldenPatient();
|
||||
|
||||
Long sourcePatient1Pid = myIdHelperService.getPidOrNull(sourcePatient1);
|
||||
Long sourcePatient2Pid = myIdHelperService.getPidOrNull(sourcePatient2);
|
||||
|
|
@ -98,8 +98,8 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
|
|||
@Test
|
||||
public void testNoMatchBlocksPossibleDuplicateReversed() {
|
||||
assertLinkCount(0);
|
||||
Patient sourcePatient1 = createSourceResourcePatient();
|
||||
Patient sourcePatient2 = createSourceResourcePatient();
|
||||
Patient sourcePatient1 = createGoldenPatient();
|
||||
Patient sourcePatient2 = createGoldenPatient();
|
||||
|
||||
Long sourcePatient1Pid = myIdHelperService.getPidOrNull(sourcePatient1);
|
||||
Long sourcePatient2Pid = myIdHelperService.getPidOrNull(sourcePatient2);
|
||||
|
|
@ -124,7 +124,7 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void testManualEmpiLinksCannotBeModifiedBySystem() {
|
||||
Patient sourcePatient = createSourceResourcePatient(buildJaneSourcePatient());
|
||||
Patient sourcePatient = createGoldenPatient(buildJaneSourcePatient());
|
||||
Patient patient = createPatient(buildJanePatient());
|
||||
|
||||
myEmpiLinkSvc.updateLink(sourcePatient, patient, EmpiMatchOutcome.NO_MATCH, EmpiLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
|
||||
|
|
@ -138,7 +138,7 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void testAutomaticallyAddedNO_MATCHEmpiLinksAreNotAllowed() {
|
||||
Patient sourcePatient = createSourceResourcePatient(buildJaneSourcePatient());
|
||||
Patient sourcePatient = createGoldenPatient(buildJaneSourcePatient());
|
||||
Patient patient = createPatient(buildJanePatient());
|
||||
|
||||
// Test: it should be impossible to have a AUTO NO_MATCH record. The only NO_MATCH records in the system must be MANUAL.
|
||||
|
|
@ -152,7 +152,7 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void testSyncDoesNotSyncNoMatchLinks() {
|
||||
Patient sourcePatient = createSourceResourcePatient(buildJaneSourcePatient());
|
||||
Patient sourcePatient = createGoldenPatient(buildJaneSourcePatient());
|
||||
Patient patient1 = createPatient(buildJanePatient());
|
||||
Patient patient2 = createPatient(buildJanePatient());
|
||||
assertEquals(0, myEmpiLinkDao.count());
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ import java.io.IOException;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
|
|
@ -54,10 +53,10 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
@Autowired
|
||||
IInterceptorService myInterceptorService;
|
||||
|
||||
private Patient myFromSourcePatient;
|
||||
private Patient myToSourcePatient;
|
||||
private Long myFromSourcePatientPid;
|
||||
private Long myToSourcePatientPid;
|
||||
private Patient myFromGoldenPatient;
|
||||
private Patient myToGoldenPatient;
|
||||
private Long myFromGoldenPatientPid;
|
||||
private Long myToGoldenPatientPid;
|
||||
private Patient myTargetPatient1;
|
||||
private Patient myTargetPatient2;
|
||||
private Patient myTargetPatient3;
|
||||
|
|
@ -66,12 +65,12 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
public void before() {
|
||||
super.loadEmpiSearchParameters();
|
||||
|
||||
myFromSourcePatient = createSourceResourcePatient();
|
||||
IdType fromSourcePatientId = myFromSourcePatient.getIdElement().toUnqualifiedVersionless();
|
||||
myFromSourcePatientPid = myIdHelperService.getPidOrThrowException(fromSourcePatientId);
|
||||
myToSourcePatient = createSourceResourcePatient();
|
||||
IdType toSourcePatientId = myToSourcePatient.getIdElement().toUnqualifiedVersionless();
|
||||
myToSourcePatientPid = myIdHelperService.getPidOrThrowException(toSourcePatientId);
|
||||
myFromGoldenPatient = createGoldenPatient();
|
||||
IdType fromSourcePatientId = myFromGoldenPatient.getIdElement().toUnqualifiedVersionless();
|
||||
myFromGoldenPatientPid = myIdHelperService.getPidOrThrowException(fromSourcePatientId);
|
||||
myToGoldenPatient = createGoldenPatient();
|
||||
IdType toGoldenPatientId = myToGoldenPatient.getIdElement().toUnqualifiedVersionless();
|
||||
myToGoldenPatientPid = myIdHelperService.getPidOrThrowException(toGoldenPatientId);
|
||||
|
||||
myTargetPatient1 = createPatient();
|
||||
myTargetPatient2 = createPatient();
|
||||
|
|
@ -90,19 +89,19 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void emptyMerge() {
|
||||
assertEquals(2, getAllSourcePatients().size());
|
||||
assertEquals(2, getAllActiveSourcePatients().size());
|
||||
assertEquals(2, getAllGoldenPatients().size());
|
||||
assertEquals(2, getAllActiveGoldenPatients().size());
|
||||
|
||||
Patient mergedSourcePatients = mergeSourcePatients();
|
||||
assertEquals(myToSourcePatient.getIdElement(), mergedSourcePatients.getIdElement());
|
||||
assertThat(mergedSourcePatients, is(sameSourceResourceAs(mergedSourcePatients)));
|
||||
assertEquals(2, getAllSourcePatients().size());
|
||||
assertEquals(1, getAllActiveSourcePatients().size());
|
||||
Patient mergedGoldenPatient = mergeGoldenPatients();
|
||||
assertEquals(myToGoldenPatient.getIdElement(), mergedGoldenPatient.getIdElement());
|
||||
assertThat(mergedGoldenPatient, is(sameSourceResourceAs(mergedGoldenPatient)));
|
||||
assertEquals(2, getAllGoldenPatients().size());
|
||||
assertEquals(1, getAllActiveGoldenPatients().size());
|
||||
}
|
||||
|
||||
private Patient mergeSourcePatients() {
|
||||
private Patient mergeGoldenPatients() {
|
||||
assertEquals(0, redirectLinkCount());
|
||||
Patient retval = (Patient) myEmpiPersonMergerSvc.mergeGoldenResources(myFromSourcePatient, myToSourcePatient, createEmpiContext());
|
||||
Patient retval = (Patient) myEmpiPersonMergerSvc.mergeGoldenResources(myFromGoldenPatient, myToGoldenPatient, createEmpiContext());
|
||||
assertEquals(1, redirectLinkCount());
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -122,8 +121,8 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
@Test
|
||||
public void mergeRemovesPossibleDuplicatesLink() {
|
||||
EmpiLink empiLink = myEmpiLinkDaoSvc.newEmpiLink()
|
||||
.setSourceResourcePid(myToSourcePatientPid)
|
||||
.setTargetPid(myFromSourcePatientPid)
|
||||
.setSourceResourcePid(myToGoldenPatientPid)
|
||||
.setTargetPid(myFromGoldenPatientPid)
|
||||
.setEmpiTargetType("Patient")
|
||||
.setMatchResult(EmpiMatchResultEnum.POSSIBLE_DUPLICATE)
|
||||
.setLinkSource(EmpiLinkSourceEnum.AUTO);
|
||||
|
|
@ -138,7 +137,7 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
myEmpiLinkHelper.logEmpiLinks();
|
||||
|
||||
mergeSourcePatients();
|
||||
mergeGoldenPatients();
|
||||
|
||||
{
|
||||
List<EmpiLink> foundLinks = myEmpiLinkDao.findAll();
|
||||
|
|
@ -149,9 +148,9 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void fullFromEmptyTo() {
|
||||
populatePerson(myFromSourcePatient);
|
||||
populatePerson(myFromGoldenPatient);
|
||||
|
||||
Patient mergedSourcePatient = mergeSourcePatients();
|
||||
Patient mergedSourcePatient = mergeGoldenPatients();
|
||||
// TODO NG - Revisit when rules are ready
|
||||
// HumanName returnedName = mergedSourcePatient.getNameFirstRep();
|
||||
// assertEquals(GIVEN_NAME, returnedName.getGivenAsSingleString());
|
||||
|
|
@ -161,10 +160,10 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void emptyFromFullTo() {
|
||||
myFromSourcePatient.getName().add(new HumanName().addGiven(BAD_GIVEN_NAME));
|
||||
populatePerson(myToSourcePatient);
|
||||
myFromGoldenPatient.getName().add(new HumanName().addGiven(BAD_GIVEN_NAME));
|
||||
populatePerson(myToGoldenPatient);
|
||||
|
||||
Patient mergedSourcePatient = mergeSourcePatients();
|
||||
Patient mergedSourcePatient = mergeGoldenPatients();
|
||||
HumanName returnedName = mergedSourcePatient.getNameFirstRep();
|
||||
assertEquals(GIVEN_NAME, returnedName.getGivenAsSingleString());
|
||||
assertEquals(FAMILY_NAME, returnedName.getFamily());
|
||||
|
|
@ -173,92 +172,92 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void fromLinkToNoLink() {
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
|
||||
Patient mergedSourcePatient = mergeSourcePatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(mergedSourcePatient);
|
||||
Patient mergedGoldenPatient = mergeGoldenPatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(mergedGoldenPatient);
|
||||
assertEquals(1, links.size());
|
||||
assertThat(mergedSourcePatient, is(possibleLinkedTo(myTargetPatient1)));
|
||||
// fail("FIXME"); TODO NG - Confirm it's ok
|
||||
assertThat(mergedGoldenPatient, is(possibleLinkedTo(myTargetPatient1)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fromNoLinkToLink() {
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
|
||||
Patient mergedSourcePatient = mergeSourcePatients();
|
||||
Patient mergedSourcePatient = mergeGoldenPatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(mergedSourcePatient);
|
||||
assertEquals(1, links.size());
|
||||
assertThat(mergedSourcePatient, is(possibleLinkedTo(myTargetPatient1)));
|
||||
// fail("FIXME"); TODO NG - Confirm it's ok
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fromManualLinkOverridesAutoToLink() {
|
||||
EmpiLink fromLink = createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
fromLink.setMatchResult(EmpiMatchResultEnum.MATCH);
|
||||
saveLink(fromLink);
|
||||
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
|
||||
mergeSourcePatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(myToSourcePatient);
|
||||
mergeGoldenPatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
|
||||
assertEquals(1, links.size());
|
||||
assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
|
||||
}
|
||||
|
||||
private List<EmpiLink> getNonRedirectLinksByPerson(Patient theSourcePatient) {
|
||||
return myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(theSourcePatient).stream()
|
||||
private List<EmpiLink> getNonRedirectLinksByPerson(Patient theGoldenPatient) {
|
||||
return myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(theGoldenPatient).stream()
|
||||
.filter(link -> !link.isRedirect())
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fromManualNoMatchLinkOverridesAutoToLink() {
|
||||
EmpiLink fromLink = createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
fromLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
|
||||
|
||||
saveLink(fromLink);
|
||||
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
|
||||
mergeSourcePatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(myToSourcePatient);
|
||||
mergeGoldenPatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
|
||||
assertEquals(1, links.size());
|
||||
assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
|
||||
assertEquals(EmpiMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fromManualAutoMatchLinkNoOverridesManualToLink() {
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
|
||||
EmpiLink toLink = createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
toLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
|
||||
saveLink(toLink);
|
||||
|
||||
mergeSourcePatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(myToSourcePatient);
|
||||
mergeGoldenPatients();
|
||||
List<EmpiLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
|
||||
assertEquals(1, links.size());
|
||||
assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
|
||||
assertEquals(EmpiMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fromNoMatchMergeToManualMatchIsError() {
|
||||
EmpiLink fromLink = createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
fromLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
|
||||
saveLink(fromLink);
|
||||
|
||||
EmpiLink toLink = createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
toLink.setMatchResult(EmpiMatchResultEnum.MATCH);
|
||||
saveLink(toLink);
|
||||
|
||||
try {
|
||||
mergeSourcePatients();
|
||||
mergeGoldenPatients();
|
||||
fail();
|
||||
} catch (InvalidRequestException e) {
|
||||
assertEquals("A MANUAL NO_MATCH link may not be merged into a MANUAL MATCH link for the same target", e.getMessage());
|
||||
|
|
@ -267,18 +266,18 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void fromMatchMergeToManualNoMatchIsError() {
|
||||
EmpiLink fromLink = createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
fromLink.setMatchResult(EmpiMatchResultEnum.MATCH);
|
||||
saveLink(fromLink);
|
||||
|
||||
EmpiLink toLink = createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
toLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
|
||||
saveLink(toLink);
|
||||
|
||||
try {
|
||||
mergeSourcePatients();
|
||||
mergeGoldenPatients();
|
||||
fail();
|
||||
} catch (InvalidRequestException e) {
|
||||
assertEquals("A MANUAL MATCH link may not be merged into a MANUAL NO_MATCH link for the same target", e.getMessage());
|
||||
|
|
@ -287,91 +286,92 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void fromNoMatchMergeToManualMatchDifferentPatientIsOk() {
|
||||
EmpiLink fromLink = createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
fromLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
|
||||
saveLink(fromLink);
|
||||
|
||||
EmpiLink toLink = createEmpiLink(myToSourcePatient, myTargetPatient2);
|
||||
EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient2);
|
||||
toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
|
||||
toLink.setMatchResult(EmpiMatchResultEnum.MATCH);
|
||||
saveLink(toLink);
|
||||
|
||||
mergeSourcePatients();
|
||||
assertResourceHasLinkCount(myToSourcePatient, 1, (e) -> false);
|
||||
// assertEquals(1, myToSourcePatient.getLink().size());
|
||||
mergeGoldenPatients();
|
||||
|
||||
assertResourceHasLinkCount(myToGoldenPatient, 3);
|
||||
assertResourceHasLinkCount(myFromGoldenPatient, 0);
|
||||
// TODO ENSURE PROPER LINK TYPES
|
||||
assertEquals(3, myEmpiLinkDao.count());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void from123To1() {
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient2);
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient3);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient2);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient3);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
|
||||
mergeSourcePatients();
|
||||
mergeGoldenPatients();
|
||||
myEmpiLinkHelper.logEmpiLinks();
|
||||
|
||||
assertThat(myToSourcePatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
// assertEquals(3, myToSourcePatient.getLink().size());
|
||||
assertResourceHasAutoLinkCount(myToSourcePatient, 3);
|
||||
assertThat(myToGoldenPatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
assertResourceHasAutoLinkCount(myToGoldenPatient, 3);
|
||||
}
|
||||
|
||||
private void assertResourceHasAutoLinkCount(IBaseResource theResource, int theCount) {
|
||||
assertResourceHasLinkCount(theResource, theCount, EmpiLink::isAuto);
|
||||
}
|
||||
|
||||
private void assertResourceHasLinkCount(IBaseResource theResource, int theCount, Predicate<EmpiLink> thePredicate) {
|
||||
private void assertResourceHasLinkCount(IBaseResource theResource, int theCount) {
|
||||
List<EmpiLink> links = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(theResource);
|
||||
assertEquals(theCount, links.stream().filter(thePredicate).count());
|
||||
assertEquals(theCount, links.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void from1To123() {
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient2);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient3);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient2);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient3);
|
||||
|
||||
mergeSourcePatients();
|
||||
mergeGoldenPatients();
|
||||
myEmpiLinkHelper.logEmpiLinks();
|
||||
|
||||
assertThat(myToSourcePatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
assertResourceHasAutoLinkCount(myToSourcePatient, 3);
|
||||
assertThat(myToGoldenPatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
assertResourceHasAutoLinkCount(myToGoldenPatient, 3);
|
||||
}
|
||||
|
||||
private void assertResourceHasAutoLinkCount(Patient myToGoldenPatient, int theCount) {
|
||||
List<EmpiLink> links = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(myToGoldenPatient);
|
||||
assertEquals(theCount, links.stream().filter(EmpiLink::isAuto).count());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void from123To123() {
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient2);
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient3);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient2);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient3);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient2);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient3);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient1);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient2);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient3);
|
||||
|
||||
mergeSourcePatients();
|
||||
mergeGoldenPatients();
|
||||
|
||||
assertThat(myToSourcePatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
assertThat(myToGoldenPatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
|
||||
// assertEquals(3, myToSourcePatient.getLink().size());
|
||||
assertResourceHasAutoLinkCount(myToSourcePatient, 3);
|
||||
assertResourceHasAutoLinkCount(myToGoldenPatient, 3);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void from12To23() {
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient1);
|
||||
createEmpiLink(myFromSourcePatient, myTargetPatient2);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient2);
|
||||
createEmpiLink(myToSourcePatient, myTargetPatient3);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient1);
|
||||
createEmpiLink(myFromGoldenPatient, myTargetPatient2);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient2);
|
||||
createEmpiLink(myToGoldenPatient, myTargetPatient3);
|
||||
|
||||
mergeSourcePatients();
|
||||
mergeGoldenPatients();
|
||||
myEmpiLinkHelper.logEmpiLinks();
|
||||
|
||||
assertThat(myToSourcePatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
assertThat(myToGoldenPatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
|
||||
|
||||
// assertEquals(3, myToSourcePatient.getLink().size());
|
||||
assertResourceHasAutoLinkCount(myToSourcePatient, 3);
|
||||
assertResourceHasAutoLinkCount(myToGoldenPatient, 3);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -412,17 +412,19 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testMergeIdentities() {
|
||||
myFromSourcePatient.addIdentifier().setValue("aaa");
|
||||
myFromSourcePatient.addIdentifier().setValue("bbb");
|
||||
assertThat(myFromSourcePatient.getIdentifier(), hasSize(2));
|
||||
public void testMergeIdentifiers() {
|
||||
myFromGoldenPatient.addIdentifier().setValue("aaa").setSystem("SYSTEM1");
|
||||
myFromGoldenPatient.addIdentifier().setValue("bbb").setSystem("SYSTEM1");
|
||||
myFromGoldenPatient.addIdentifier().setValue("ccc").setSystem("SYSTEM2");
|
||||
assertThat(myFromGoldenPatient.getIdentifier(), hasSize(3));
|
||||
|
||||
myToSourcePatient.addIdentifier().setValue("aaa");
|
||||
myToSourcePatient.addIdentifier().setValue("ccc");
|
||||
assertThat(myToSourcePatient.getIdentifier(), hasSize(2));
|
||||
myToGoldenPatient.addIdentifier().setValue("aaa").setSystem("SYSTEM1");
|
||||
myToGoldenPatient.addIdentifier().setValue("ccc").setSystem("SYSTEM1");
|
||||
assertThat(myToGoldenPatient.getIdentifier(), hasSize(2));
|
||||
|
||||
mergeSourcePatients();
|
||||
assertThat(myToSourcePatient.getIdentifier(), hasSize(3));
|
||||
mergeGoldenPatients();
|
||||
|
||||
assertThat(myToGoldenPatient.getIdentifier(), hasSize(4));
|
||||
}
|
||||
|
||||
private EmpiLink createEmpiLink(Patient theSourcePatient, Patient theTargetPatient) {
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ public class EmpiResourceDaoSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void testSearchPersonByEidExcludesInactive() {
|
||||
Patient goodSourcePatient = addExternalEID(createSourceResourcePatient(), TEST_EID);
|
||||
Patient goodSourcePatient = addExternalEID(createGoldenPatient(), TEST_EID);
|
||||
myPatientDao.update(goodSourcePatient);
|
||||
|
||||
Patient badSourcePatient = addExternalEID(createSourceResourcePatient(), TEST_EID);
|
||||
Patient badSourcePatient = addExternalEID(createGoldenPatient(), TEST_EID);
|
||||
badSourcePatient.setActive(false);
|
||||
myPatientDao.update(badSourcePatient);
|
||||
|
||||
|
|
@ -39,10 +39,10 @@ public class EmpiResourceDaoSvcTest extends BaseEmpiR4Test {
|
|||
|
||||
@Test
|
||||
public void testSearchPersonByEidExcludesNonEmpiManaged() {
|
||||
Patient goodSourcePatient = addExternalEID(createSourceResourcePatient(), TEST_EID);
|
||||
Patient goodSourcePatient = addExternalEID(createGoldenPatient(), TEST_EID);
|
||||
myPatientDao.update(goodSourcePatient);
|
||||
|
||||
Patient badSourcePatient = addExternalEID(createSourceResourcePatient(new Patient(), false), TEST_EID);
|
||||
Patient badSourcePatient = addExternalEID(createGoldenPatient(new Patient(), false), TEST_EID);
|
||||
myPatientDao.update(badSourcePatient);
|
||||
|
||||
Optional<IAnyResource> foundSourcePatient = myResourceDaoSvc.searchSourceResourceByEID(TEST_EID, "Patient");
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ import static ca.uhn.fhir.context.FhirVersionEnum.R4;
|
|||
public class PersonHelper {
|
||||
private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
|
||||
|
||||
private static final String FIELD_NAME_IDENTIFIER = "identifier";
|
||||
|
||||
@Autowired
|
||||
private IEmpiSettings myEmpiConfig;
|
||||
@Autowired
|
||||
|
|
@ -94,7 +96,7 @@ public class PersonHelper {
|
|||
IBaseResource newSourceResource = resourceDefinition.newInstance();
|
||||
|
||||
// hapi has 2 metamodels: for children and types
|
||||
BaseRuntimeChildDefinition sourceResourceIdentifier = resourceDefinition.getChildByName("identifier");
|
||||
BaseRuntimeChildDefinition sourceResourceIdentifier = resourceDefinition.getChildByName(FIELD_NAME_IDENTIFIER);
|
||||
|
||||
cloneAllExternalEidsIntoNewSourceResource(sourceResourceIdentifier, theIncomingResource, newSourceResource);
|
||||
|
||||
|
|
@ -143,7 +145,7 @@ public class PersonHelper {
|
|||
// get a ref to the actual ID Field
|
||||
RuntimeResourceDefinition resourceDefinition = myFhirContext.getResourceDefinition(theResourceToCloneInto);
|
||||
// hapi has 2 metamodels: for children and types
|
||||
BaseRuntimeChildDefinition resourceIdentifier = resourceDefinition.getChildByName("identifier");
|
||||
BaseRuntimeChildDefinition resourceIdentifier = resourceDefinition.getChildByName(FIELD_NAME_IDENTIFIER);
|
||||
cloneEidIntoResource(resourceIdentifier, toId(theEid), theResourceToCloneInto);
|
||||
}
|
||||
|
||||
|
|
@ -152,7 +154,7 @@ public class PersonHelper {
|
|||
*/
|
||||
private void cloneEidIntoResource(BaseRuntimeChildDefinition theIdentifierDefinition, IBase theEid, IBase theResourceToCloneEidInto) {
|
||||
// FHIR choice types - fields within fhir where we have a choice of ids
|
||||
BaseRuntimeElementCompositeDefinition<?> childIdentifier = (BaseRuntimeElementCompositeDefinition<?>) theIdentifierDefinition.getChildByName("identifier");
|
||||
BaseRuntimeElementCompositeDefinition<?> childIdentifier = (BaseRuntimeElementCompositeDefinition<?>) theIdentifierDefinition.getChildByName(FIELD_NAME_IDENTIFIER);
|
||||
IBase resourceNewIdentifier = childIdentifier.newInstance();
|
||||
|
||||
FhirTerser terser = myFhirContext.newTerser();
|
||||
|
|
@ -160,6 +162,44 @@ public class PersonHelper {
|
|||
theIdentifierDefinition.getMutator().addValue(theResourceToCloneEidInto, resourceNewIdentifier);
|
||||
}
|
||||
|
||||
/**
|
||||
* Clones specified composite field (collection). Composite field values must confirm to the collections
|
||||
* contract.
|
||||
*
|
||||
* @param theFrom Resource to clone the specified filed from
|
||||
* @param theTo Resource to clone the specified filed to
|
||||
* @param field Field name to be copied
|
||||
*/
|
||||
private void cloneCompositeField(IBaseResource theFrom, IBaseResource theTo, String field) {
|
||||
FhirTerser terser = myFhirContext.newTerser();
|
||||
|
||||
RuntimeResourceDefinition definition = myFhirContext.getResourceDefinition(theFrom);
|
||||
BaseRuntimeChildDefinition childDefinition = definition.getChildByName(field);
|
||||
|
||||
IFhirPath fhirPath = myFhirContext.newFhirPath();
|
||||
List<IBase> theFromFieldValues = childDefinition.getAccessor().getValues(theFrom);
|
||||
List<IBase> theToFieldValues = childDefinition.getAccessor().getValues(theTo);
|
||||
|
||||
for (IBase theFromFieldValue: theFromFieldValues) {
|
||||
if (contains(theFromFieldValue, theToFieldValues)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
BaseRuntimeElementCompositeDefinition<?> compositeDefinition = (BaseRuntimeElementCompositeDefinition<?>) childDefinition.getChildByName(field);
|
||||
IBase newFieldValue = compositeDefinition.newInstance();
|
||||
terser.cloneInto(theFromFieldValue, newFieldValue, true);
|
||||
|
||||
theToFieldValues.add(newFieldValue);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean contains(IBase theItem, List<IBase> theItems) {
|
||||
PrimitiveTypeComparingPredicate predicate = new PrimitiveTypeComparingPredicate();
|
||||
return theItems.stream().filter(i -> {
|
||||
return predicate.test(i, theItem);
|
||||
}).findFirst().isPresent();
|
||||
}
|
||||
|
||||
private void cloneAllExternalEidsIntoNewSourceResource(BaseRuntimeChildDefinition theSourceResourceIdentifier, IBase theSourceResource, IBase theNewSourceResource) {
|
||||
// FHIR choice types - fields within fhir where we have a choice of ids
|
||||
IFhirPath fhirPath = myFhirContext.newFhirPath();
|
||||
|
|
@ -244,7 +284,7 @@ public class PersonHelper {
|
|||
}
|
||||
|
||||
BaseRuntimeElementCompositeDefinition<?> childIdentifier = (BaseRuntimeElementCompositeDefinition<?>)
|
||||
theSourceResourceIdentifier.getChildByName("identifier");
|
||||
theSourceResourceIdentifier.getChildByName(FIELD_NAME_IDENTIFIER);
|
||||
IBase sourceResourceNewIdentifier = childIdentifier.newInstance();
|
||||
terser.cloneInto(base, sourceResourceNewIdentifier, true);
|
||||
|
||||
|
|
@ -261,7 +301,7 @@ public class PersonHelper {
|
|||
|
||||
// get a ref to the actual ID Field
|
||||
RuntimeResourceDefinition resourceDefinition = myFhirContext.getResourceDefinition(theSourceResource);
|
||||
BaseRuntimeChildDefinition sourceResourceIdentifier = resourceDefinition.getChildByName("identifier");
|
||||
BaseRuntimeChildDefinition sourceResourceIdentifier = resourceDefinition.getChildByName(FIELD_NAME_IDENTIFIER);
|
||||
clearExternalEidsFromTheSourceResource(sourceResourceIdentifier, theSourceResource);
|
||||
}
|
||||
|
||||
|
|
@ -280,7 +320,7 @@ public class PersonHelper {
|
|||
}
|
||||
}
|
||||
|
||||
private <T> T toId(CanonicalEID eid) {
|
||||
private <T extends IBase> T toId(CanonicalEID eid) {
|
||||
switch (myFhirContext.getVersion().getVersion()) {
|
||||
case R4:
|
||||
return (T) eid.toR4();
|
||||
|
|
@ -328,16 +368,19 @@ public class PersonHelper {
|
|||
}
|
||||
|
||||
public void mergeFields(IBaseResource theFromPerson, IBaseResource theToPerson) {
|
||||
switch (myFhirContext.getVersion().getVersion()) {
|
||||
case R4:
|
||||
mergeR4PersonFields(theFromPerson, theToPerson);
|
||||
break;
|
||||
case DSTU3:
|
||||
mergeDstu3PersonFields(theFromPerson, theToPerson);
|
||||
break;
|
||||
default:
|
||||
throw new UnsupportedOperationException("Version not supported: " + myFhirContext.getVersion().getVersion());
|
||||
}
|
||||
// TODO NG - Revisit when merge rules are defined
|
||||
cloneCompositeField(theFromPerson, theToPerson, FIELD_NAME_IDENTIFIER);
|
||||
|
||||
// switch (myFhirContext.getVersion().getVersion()) {
|
||||
// case R4:
|
||||
// mergeR4PersonFields(theFromPerson, theToPerson);
|
||||
// break;
|
||||
// case DSTU3:
|
||||
// mergeDstu3PersonFields(theFromPerson, theToPerson);
|
||||
// break;
|
||||
// default:
|
||||
// throw new UnsupportedOperationException("Version not supported: " + myFhirContext.getVersion().getVersion());
|
||||
// }
|
||||
}
|
||||
|
||||
private void mergeR4PersonFields(IBaseResource theFromPerson, IBaseResource theToPerson) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
package ca.uhn.fhir.empi.util;
|
||||
|
||||
import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
import ca.uhn.fhir.context.RuntimeResourceDefinition;
|
||||
import ca.uhn.fhir.util.FhirTerser;
|
||||
import org.hl7.fhir.instance.model.api.IBase;
|
||||
import org.hl7.fhir.instance.model.api.IBaseResource;
|
||||
import org.hl7.fhir.instance.model.api.IPrimitiveType;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.function.BiPredicate;
|
||||
|
||||
public class PrimitiveTypeComparingPredicate implements BiPredicate {
|
||||
|
||||
@Override
|
||||
public boolean test(Object theBase1, Object theBase2) {
|
||||
if (theBase1 == null) {
|
||||
return theBase2 == null;
|
||||
}
|
||||
if (theBase2 == null) {
|
||||
return false;
|
||||
}
|
||||
if (!theBase1.getClass().equals(theBase2.getClass())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (Field f : theBase1.getClass().getDeclaredFields()) {
|
||||
Class<?> fieldClass = f.getType();
|
||||
|
||||
if (!IPrimitiveType.class.isAssignableFrom(fieldClass)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
IPrimitiveType<?> val1, val2;
|
||||
|
||||
f.setAccessible(true);
|
||||
try {
|
||||
val1 = (IPrimitiveType<?>) f.get(theBase1);
|
||||
val2 = (IPrimitiveType<?>) f.get(theBase2);
|
||||
} catch (Exception e) {
|
||||
// swallow
|
||||
continue;
|
||||
}
|
||||
|
||||
if (val1 == null && val2 == null) {
|
||||
continue;
|
||||
}
|
||||
if (val1 == null && val2 != null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Object actualVal1 = val1.getValue();
|
||||
Object actualVal2 = val2.getValue();
|
||||
|
||||
if (actualVal1 == null && actualVal2 == null) {
|
||||
continue;
|
||||
}
|
||||
if (actualVal1 == null && actualVal2 != null) {
|
||||
return false;
|
||||
}
|
||||
if (!actualVal1.equals(actualVal2)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
package ca.uhn.fhir.empi.util;
|
||||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
import ca.uhn.fhir.util.FhirTerser;
|
||||
import org.hl7.fhir.instance.model.api.IBase;
|
||||
import org.hl7.fhir.r4.model.Address;
|
||||
import org.hl7.fhir.r4.model.BooleanType;
|
||||
import org.hl7.fhir.r4.model.DateType;
|
||||
import org.hl7.fhir.r4.model.Enumerations;
|
||||
import org.hl7.fhir.r4.model.Identifier;
|
||||
import org.hl7.fhir.r4.model.Patient;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
class PrimitiveTypeComparingPredicateTest {
|
||||
|
||||
private static FhirContext myFhirContext;
|
||||
|
||||
private FhirTerser myTerser;
|
||||
|
||||
private IBase myPositiveTest1;
|
||||
|
||||
private IBase myPositiveTest2;
|
||||
|
||||
private IBase myPositiveTest3;
|
||||
|
||||
private IBase myNegativeTest;
|
||||
|
||||
private PrimitiveTypeComparingPredicate cut = new PrimitiveTypeComparingPredicate();
|
||||
|
||||
@BeforeAll
|
||||
public static void initContext() {
|
||||
myFhirContext = FhirContext.forR4();
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
public void init() {
|
||||
myTerser = myFhirContext.newTerser();
|
||||
|
||||
myPositiveTest1 = newPatient();
|
||||
myPositiveTest2 = newPatient();
|
||||
myPositiveTest3 = newPatient();
|
||||
|
||||
Patient patient = newPatient();
|
||||
patient.setActive(false);
|
||||
patient.setMultipleBirth(new BooleanType(false));
|
||||
myNegativeTest = patient;
|
||||
}
|
||||
|
||||
private Patient newPatient() {
|
||||
Patient patient;
|
||||
patient = new Patient();
|
||||
patient.setActive(true);
|
||||
patient.setGender(Enumerations.AdministrativeGender.FEMALE);
|
||||
patient.setBirthDateElement(new DateType("1901-01-01"));
|
||||
|
||||
Address address = new Address();
|
||||
address.addLine("Somwhere");
|
||||
address.setCity("Toronto");
|
||||
address.setCountry("Canada");
|
||||
patient.setAddress(Collections.singletonList(address));
|
||||
return patient;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNegativeMatchOnTheSameType() {
|
||||
assertFalse(cut.test(myPositiveTest1, myNegativeTest));
|
||||
assertFalse(cut.test(myNegativeTest, myPositiveTest1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNegativeMatchOnDifferentTypes() {
|
||||
Patient patient = newPatient();
|
||||
Identifier identifier = patient.addIdentifier();
|
||||
identifier.setValue("TEST_VALUE");
|
||||
assertFalse(cut.test(myNegativeTest, identifier));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSymmetry() {
|
||||
assertTrue(cut.test(myPositiveTest1, myPositiveTest2));
|
||||
assertTrue(cut.test(myPositiveTest2, myPositiveTest1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testReflexivity() {
|
||||
assertTrue(cut.test(myPositiveTest1, myPositiveTest1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTransitivity() {
|
||||
assertTrue(cut.test(myPositiveTest1, myPositiveTest2));
|
||||
assertTrue(cut.test(myPositiveTest2, myPositiveTest3));
|
||||
assertTrue(cut.test(myPositiveTest1, myPositiveTest3));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue