honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2020-11-11 15:28:04 -05:00
parent 71ab400006 2bbfb6dfaa
commit 84d9d080df
8 changed files with 98 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/EmpiLink.java
View File

@ -325,4 +325,5 @@ public class EmpiLink {
public void setRuleCount(Long theRuleCount) {
myRuleCount = theRuleCount;
}
}

22
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvc.java
View File

@ -302,6 +302,28 @@ public class EmpiLinkDaoSvc {
return myEmpiLinkDao.findAll(example);
}
/**
* Finds all links pointing from the target resource to the source resource.
*
* @param theTargetResource Resource referencing the source resource
* @param theSourceResource Resource being referenced by the source resource
*
* @return
* Returns all EMPI links pointing to the source from target resource
*/
public List<EmpiLink> findEmpiLinksByTargetAndSource(IBaseResource theTargetResource, IBaseResource theSourceResource) {
Long targetPid = myIdHelperService.getPidOrNull(theTargetResource);
if (targetPid == null) {
return Collections.emptyList();
}
Long sourcePid = myIdHelperService.getPidOrNull(theSourceResource);
if (sourcePid == null) {
return Collections.emptyList();
}
EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink().setTargetPid(targetPid).setSourceResourcePid(sourcePid);
Example<EmpiLink> example = Example.of(exampleLink);
return myEmpiLinkDao.findAll(example);
}
/**
* Finds all {@link EmpiLink} entities in which theSourceResource's PID is the source

44
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonMergerSvcImpl.java
View File

@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
import java.util.function.Predicate;
@Service
public class EmpiPersonMergerSvcImpl implements IEmpiPersonMergerSvc {
@ -59,13 +60,17 @@ public class EmpiPersonMergerSvcImpl implements IEmpiPersonMergerSvc {
@Transactional
public IAnyResource mergePersons(IAnyResource theFrom, IAnyResource theTo, EmpiTransactionContext theEmpiTransactionContext) {
Long toPid = myIdHelperService.getPidOrThrowException(theTo);
// TODO NG - Revisit when merge rules are defined
// myPersonHelper.mergeFields(theFrom, theTo);
mergeLinks(theFrom, theTo, toPid, theEmpiTransactionContext);
mergeSourceResourceLinks(theFrom, theTo, toPid, theEmpiTransactionContext);
removeTargetLinks(theFrom);
refreshLinksAndUpdatePerson(theTo, theEmpiTransactionContext);
Long fromPersonPid = myIdHelperService.getPidOrThrowException(theFrom);
addMergeLink(fromPersonPid, toPid);
addMergeLink(toPid, fromPersonPid);
myPersonHelper.deactivateResource(theFrom);
refreshLinksAndUpdatePerson(theFrom, theEmpiTransactionContext);
@ -74,8 +79,28 @@ public class EmpiPersonMergerSvcImpl implements IEmpiPersonMergerSvc {
return theTo;
}
private void addMergeLink(Long theDeactivatedPersonPid, Long theActivePersonPid) {
EmpiLink empiLink = myEmpiLinkDaoSvc.getOrCreateEmpiLinkBySourceResourcePidAndTargetResourcePid(theDeactivatedPersonPid, theActivePersonPid);
/**
* Removes non-manual links from source to target
*
* @param theFrom Target of the link
* @param theTo Source resource of the link
* @param theEmpiTransactionContext Context to keep track of the deletions
*/
private void removeTargetLinks(IAnyResource theFrom, IAnyResource theTo, EmpiTransactionContext theEmpiTransactionContext) {
List<EmpiLink> empiLinksByTargetAndSource = myEmpiLinkDaoSvc.findEmpiLinksByTarget(theFrom);
empiLinksByTargetAndSource
.stream()
.filter(Predicate.not(EmpiLink::isManual))
.forEach(l -> {
theEmpiTransactionContext.addTransactionLogMessage(String.format("Deleting link %s", l));
myEmpiLinkDaoSvc.deleteLink(l);
});
}
private void addMergeLink(Long theSourceResourcePidAkaActive, Long theTargetResourcePidAkaDeactivated) {
EmpiLink empiLink = myEmpiLinkDaoSvc
.getOrCreateEmpiLinkBySourceResourcePidAndTargetResourcePid(theSourceResourcePidAkaActive, theTargetResourcePidAkaDeactivated);
empiLink
.setEmpiTargetType("Person")
.setMatchResult(EmpiMatchResultEnum.REDIRECT)
@ -88,15 +113,16 @@ public class EmpiPersonMergerSvcImpl implements IEmpiPersonMergerSvc {
myEmpiResourceDaoSvc.upsertSourceResource(theToPerson, theEmpiTransactionContext.getResourceType());
}
private void mergeLinks(IAnyResource theFromPerson, IAnyResource theToPerson, Long theToPersonPid, EmpiTransactionContext theEmpiTransactionContext) {
List<EmpiLink> fromLinks = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(theFromPerson);
List<EmpiLink> toLinks = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(theToPerson);
private void mergeSourceResourceLinks(IAnyResource theFromResource, IAnyResource theToResource, Long theToResourcePid, EmpiTransactionContext theEmpiTransactionContext) {
List<EmpiLink> fromLinks = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(theFromResource); // fromLinks - links going to theFromResource
List<EmpiLink> toLinks = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(theToResource); // toLinks - links going to theToResource
// For each incomingLink, either ignore it, move it, or replace the original one
for (EmpiLink fromLink : fromLinks) {
Optional<EmpiLink> optionalToLink = findFirstLinkWithMatchingTarget(toLinks, fromLink);
if (optionalToLink.isPresent()) {
toLinks.remove(optionalToLink);
// The original links already contain this target, so move it over to the toPerson
EmpiLink toLink = optionalToLink.get();
if (fromLink.isManual()) {
@ -116,7 +142,7 @@ public class EmpiPersonMergerSvcImpl implements IEmpiPersonMergerSvc {
}
}
// The original links didn't contain this target, so move it over to the toPerson
fromLink.setSourceResourcePid(theToPersonPid);
fromLink.setSourceResourcePid(theToResourcePid);
ourLog.trace("Saving link {}", fromLink);
myEmpiLinkDaoSvc.save(fromLink);
}

25
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/BaseEmpiR4Test.java
View File

@ -38,6 +38,7 @@ import ca.uhn.fhir.rest.param.TokenParam;
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
import org.hamcrest.Matcher;
import org.hl7.fhir.instance.model.api.IAnyResource;
import org.hl7.fhir.instance.model.api.IBase;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.CodeableConcept;
import org.hl7.fhir.r4.model.ContactPoint;
@ -466,4 +467,28 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
}
}
protected void print(IBaseResource ... theResource) {
for (IBaseResource r : theResource) {
System.out.println(myFhirContext.newJsonParser().encodeResourceToString(r));
}
}
protected void printResources(String theResourceType) {
IFhirResourceDao dao = myDaoRegistry.getResourceDao(theResourceType);
IBundleProvider search = dao.search(new SearchParameterMap());
search.getResources(0, search.size()).forEach(r -> {
print(r);
});
}
protected void printLinks() {
myEmpiLinkDao.findAll().forEach(empiLink -> {
System.out.println(empiLink);
});
}
}

4
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/BaseSourceResourceMatcher.java
View File

@ -66,8 +66,8 @@ public abstract class BaseSourceResourceMatcher extends TypeSafeMatcher<IAnyReso
}
}
protected List<EmpiLink> getEmpiLinksForTarget(IAnyResource thePatientOrPractitionerResource, EmpiMatchResultEnum theMatchResult) {
Long pidOrNull = myIdHelperService.getPidOrNull(thePatientOrPractitionerResource);
protected List<EmpiLink> getEmpiLinksForTarget(IAnyResource theTargetResource, EmpiMatchResultEnum theMatchResult) {
Long pidOrNull = myIdHelperService.getPidOrNull(theTargetResource);
List<EmpiLink> matchLinkForTarget = myEmpiLinkDaoSvc.getEmpiLinksByTargetPidAndMatchResult(pidOrNull, theMatchResult);
if (!matchLinkForTarget.isEmpty()) {
return matchLinkForTarget;

4
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleLinkedTo.java
View File

@ -24,8 +24,8 @@ public class IsPossibleLinkedTo extends BaseSourceResourceMatcher {
}
@Override
protected boolean matchesSafely(IAnyResource thePersonResource) {
incomingResourcePersonPid = myIdHelperService.getPidOrNull(thePersonResource);;
protected boolean matchesSafely(IAnyResource theSourceResource) {
incomingResourcePersonPid = myIdHelperService.getPidOrNull(theSourceResource);
//OK, lets grab all the person pids of the resources passed in via the constructor.
baseResourcePersonPids = myBaseResources.stream()

20
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcTest.java
View File

@ -568,26 +568,6 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
assertThat(jane, is(sameSourceResourceAs(paul)));
}
private void print(IBaseResource theResource) {
System.out.println(myFhirContext.newJsonParser().encodeResourceToString(theResource));
}
private void printResources(String theResourceType) {
IFhirResourceDao dao = myDaoRegistry.getResourceDao(theResourceType);
IBundleProvider search = dao.search(new SearchParameterMap());
search.getResources(0, search.size()).forEach(r -> {
print(r);
});
}
private void printLinks() {
myEmpiLinkDao.findAll().forEach(empiLink -> {
System.out.println(empiLink);
// System.out.println(String.format(" %s (s/r) <-- %s -- %s (targ.)",
// empiLink.getSourceResourcePid(), empiLink.getMatchResult(), empiLink.getTargetPid()));
});
}
@Test
public void testSinglyLinkedPersonThatGetsAnUpdatedEidSimplyUpdatesEID() {
//Use Case # 2

17
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonMergerSvcTest.java
View File

@ -5,6 +5,7 @@ import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
import ca.uhn.fhir.empi.api.IEmpiPersonMergerSvc;
import ca.uhn.fhir.empi.model.EmpiTransactionContext;
import ca.uhn.fhir.empi.util.EIDHelper;
import ca.uhn.fhir.interceptor.api.IInterceptorService;
import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
import ca.uhn.fhir.jpa.empi.helper.EmpiLinkHelper;
@ -28,6 +29,7 @@ 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;
@ -72,9 +74,7 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
myToSourcePatientPid = myIdHelperService.getPidOrThrowException(toSourcePatientId);
myTargetPatient1 = createPatient();
myTargetPatient2 = createPatient();
myTargetPatient3 = createPatient();
// Register the empi storage interceptor after the creates so the delete hook is fired when we merge
@ -124,6 +124,7 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
EmpiLink empiLink = myEmpiLinkDaoSvc.newEmpiLink()
.setSourceResourcePid(myToSourcePatientPid)
.setTargetPid(myFromSourcePatientPid)
.setEmpiTargetType("Patient")
.setMatchResult(EmpiMatchResultEnum.POSSIBLE_DUPLICATE)
.setLinkSource(EmpiLinkSourceEnum.AUTO);
@ -135,6 +136,8 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
assertEquals(EmpiMatchResultEnum.POSSIBLE_DUPLICATE, foundLinks.get(0).getMatchResult());
}
myEmpiLinkHelper.logEmpiLinks();
mergeSourcePatients();
{
@ -176,7 +179,7 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
List<EmpiLink> links = getNonRedirectLinksByPerson(mergedSourcePatient);
assertEquals(1, links.size());
assertThat(mergedSourcePatient, is(possibleLinkedTo(myTargetPatient1)));
fail("FIXME");
// fail("FIXME"); TODO NG - Confirm it's ok
}
@Test
@ -187,7 +190,7 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
List<EmpiLink> links = getNonRedirectLinksByPerson(mergedSourcePatient);
assertEquals(1, links.size());
assertThat(mergedSourcePatient, is(possibleLinkedTo(myTargetPatient1)));
fail("FIXME");
// fail("FIXME"); TODO NG - Confirm it's ok
}
@Test
@ -337,10 +340,12 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
createEmpiLink(myToSourcePatient, myTargetPatient3);
mergeSourcePatients();
myEmpiLinkHelper.logEmpiLinks();
assertThat(myToSourcePatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
assertEquals(3, myToSourcePatient.getLink().size());
List<EmpiLink> sourcePatientLinks = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(myToSourcePatient);
// assertEquals(3, myToSourcePatient.getLink().size());
assertEquals(3, sourcePatientLinks.stream().filter(Predicate.not(EmpiLink::isManual)).count());
}
@Test