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

wip (#5091)

This commit is contained in:
Tadgh 2023-07-13 15:56:23 -07:00 committed by GitHub
parent 2401b2339e
commit 6178075448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/spotless.yml vendored
View File

@ -6,7 +6,7 @@ on:
types: [opened, reopened, synchronize]
jobs:
build:
format-check:
runs-on: ubuntu-latest
permissions:
pull-requests: write

35
hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java
View File

@ -77,17 +77,17 @@ public class FindCandidateByExampleSvc<P extends IResourcePersistentId> extends
List<P> goldenResourcePidsToExclude = getNoMatchGoldenResourcePids(theTarget);
List<MatchedTarget> matchedCandidates = myMdmMatchFinderSvc.getMatchedTargets(
myFhirContext.getResourceType(theTarget),
theTarget,
myMdmPartitionHelper.getRequestPartitionIdFromResourceForSearch(theTarget));
myFhirContext.getResourceType(theTarget),
theTarget,
myMdmPartitionHelper.getRequestPartitionIdFromResourceForSearch(theTarget));
// Convert all possible match targets to their equivalent Golden Resources by looking up in the MdmLink table,
// while ensuring that the matches aren't in our NO_MATCH list.
// The data flow is as follows ->
// MatchedTargetCandidate -> Golden Resource -> MdmLink -> MatchedGoldenResourceCandidate
matchedCandidates = matchedCandidates.stream()
.filter(mc -> mc.isMatch() || mc.isPossibleMatch())
.collect(Collectors.toList());
.filter(mc -> mc.isMatch() || mc.isPossibleMatch())
.collect(Collectors.toList());
List<String> skippedLogMessages = new ArrayList<>();
List<String> matchedLogMessages = new ArrayList<>();
@ -96,12 +96,12 @@ public class FindCandidateByExampleSvc<P extends IResourcePersistentId> extends
Set<Long> currentIds = new HashSet<>();
for (MatchedTarget match : matchedCandidates) {
Optional<? extends IMdmLink> optionalMdmLink = myMdmLinkDaoSvc.getMatchedLinkForSourcePid(
myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), match.getTarget()));
myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), match.getTarget()));
if (!optionalMdmLink.isPresent()) {
if (ourLog.isDebugEnabled()) {
skippedLogMessages.add(String.format(
"%s does not link to a Golden Resource (it may be a Golden Resource itself). Removing candidate.",
match.getTarget().getIdElement().toUnqualifiedVersionless()));
"%s does not link to a Golden Resource (it may be a Golden Resource itself). Removing candidate.",
match.getTarget().getIdElement().toUnqualifiedVersionless()));
}
continue;
}
@ -109,23 +109,22 @@ public class FindCandidateByExampleSvc<P extends IResourcePersistentId> extends
IMdmLink matchMdmLink = optionalMdmLink.get();
if (goldenResourcePidsToExclude.contains(matchMdmLink.getGoldenResourcePersistenceId())) {
skippedLogMessages.add(String.format(
"Skipping MDM on candidate Golden Resource with PID %s due to manual NO_MATCH",
matchMdmLink.getGoldenResourcePersistenceId().toString()));
"Skipping MDM on candidate Golden Resource with PID %s due to manual NO_MATCH",
matchMdmLink.getGoldenResourcePersistenceId().toString()));
continue;
}
MatchedGoldenResourceCandidate candidate = new MatchedGoldenResourceCandidate(
matchMdmLink.getGoldenResourcePersistenceId(), match.getMatchResult());
matchMdmLink.getGoldenResourcePersistenceId(), match.getMatchResult());
if (ourLog.isDebugEnabled()) {
matchedLogMessages.add(String.format(
"Navigating from matched resource %s to its Golden Resource %s",
match.getTarget().getIdElement().toUnqualifiedVersionless(),
matchMdmLink.getGoldenResourcePersistenceId().toString())
);
"Navigating from matched resource %s to its Golden Resource %s",
match.getTarget().getIdElement().toUnqualifiedVersionless(),
matchMdmLink.getGoldenResourcePersistenceId().toString()));
}
//only add if it's not already in the list
// only add if it's not already in the list
if (currentIds.add((Long) candidate.getCandidateGoldenResourcePid().getId())) {
retval.add(candidate);
}
@ -145,8 +144,8 @@ public class FindCandidateByExampleSvc<P extends IResourcePersistentId> extends
private List<P> getNoMatchGoldenResourcePids(IBaseResource theBaseResource) {
P targetPid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theBaseResource);
return myMdmLinkDaoSvc.getMdmLinksBySourcePidAndMatchResult(targetPid, MdmMatchResultEnum.NO_MATCH).stream()
.map(IMdmLink::getGoldenResourcePersistenceId)
.collect(Collectors.toList());
.map(IMdmLink::getGoldenResourcePersistenceId)
.collect(Collectors.toList());
}
@Override