From 4be3334f6ff29f13629d65e67957475547de0c46 Mon Sep 17 00:00:00 2001
From: Nick Goupinets <nick.goupinets@smilecdr.com>
Date: Wed, 4 Aug 2021 16:33:59 -0400
Subject: [PATCH] WIP after persistence checked

---
 .../dao/r4/FhirResourceDaoCodeSystemR4.java   |  2 +-
 .../jpa/mdm/broker/MdmMessageHandler.java     | 30 ++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCodeSystemR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCodeSystemR4.java
index 6a01ab94c70..5f2aa32a2ec 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCodeSystemR4.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCodeSystemR4.java
@@ -138,7 +138,7 @@ public class FhirResourceDaoCodeSystemR4 extends BaseHapiFhirResourceDao<CodeSys
 	}
 
 	@Override
-	public ResourceTable 4updateEntity(RequestDetails theRequest, IBaseResource theResource, IBasePersistedResource theEntity, Date theDeletedTimestampOrNull, boolean thePerformIndexing,
+	public ResourceTable updateEntity(RequestDetails theRequest, IBaseResource theResource, IBasePersistedResource theEntity, Date theDeletedTimestampOrNull, boolean thePerformIndexing,
 												 boolean theUpdateVersion, TransactionDetails theTransactionDetails, boolean theForceUpdate, boolean theCreateNewHistoryEntry) {
 		ResourceTable retVal = super.updateEntity(theRequest, theResource, theEntity, theDeletedTimestampOrNull, thePerformIndexing, theUpdateVersion, theTransactionDetails, theForceUpdate, theCreateNewHistoryEntry);
 
diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java
index b80d2caafc7..5f103311abb 100644
--- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java
+++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java
@@ -24,11 +24,15 @@ import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.interceptor.api.HookParams;
 import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
 import ca.uhn.fhir.interceptor.api.Pointcut;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmLinkSvcImpl;
 import ca.uhn.fhir.jpa.mdm.svc.MdmMatchLinkSvc;
 import ca.uhn.fhir.jpa.mdm.svc.MdmResourceFilteringSvc;
 import ca.uhn.fhir.jpa.mdm.svc.candidate.TooManyCandidatesException;
 import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage;
 import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
 import ca.uhn.fhir.mdm.api.IMdmSettings;
 import ca.uhn.fhir.mdm.api.MdmLinkChangeEvent;
 import ca.uhn.fhir.mdm.log.Logs;
@@ -46,11 +50,15 @@ import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessagingException;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 public class MdmMessageHandler implements MessageHandler {
-	
+
 	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
+	@Autowired
+	private MdmLinkDaoSvc myMdmLinkDaoSvc;
 	@Autowired
 	private MdmMatchLinkSvc myMdmMatchLinkSvc;
 	@Autowired
@@ -88,7 +96,7 @@ public class MdmMessageHandler implements MessageHandler {
 	private void matchMdmAndUpdateLinks(ResourceModifiedMessage theMsg) {
 		String resourceType = theMsg.getId(myFhirContext).getResourceType();
 		validateResourceType(resourceType);
-		MdmTransactionContext mdmContext =  createMdmContext(theMsg, resourceType);
+		MdmTransactionContext mdmContext = createMdmContext(theMsg, resourceType);
 		try {
 			switch (theMsg.getOperationType()) {
 				case CREATE:
@@ -102,16 +110,30 @@ public class MdmMessageHandler implements MessageHandler {
 				default:
 					ourLog.trace("Not processing modified message for {}", theMsg.getOperationType());
 			}
-		}catch (Exception e) {
+		} catch (Exception e) {
 			log(mdmContext, "Failure during MDM processing: " + e.getMessage(), e);
 			mdmContext.addTransactionLogMessage(e.getMessage());
 		} finally {
-
 			// Interceptor call: MDM_AFTER_PERSISTED_RESOURCE_CHECKED
 			IBaseResource targetResource = theMsg.getPayload(myFhirContext);
 			ResourceOperationMessage outgoingMsg = new ResourceOperationMessage(myFhirContext, targetResource, theMsg.getOperationType());
 			outgoingMsg.setTransactionId(theMsg.getTransactionId());
 
+			MdmLinkChangeEvent linkChangeEvent = mdmContext.getMdmLinkChangeEvent();
+			Optional<MdmLink> mdmLinkBySource = myMdmLinkDaoSvc.findMdmLinkBySource(targetResource);
+			if (!mdmLinkBySource.isPresent()) {
+				ourLog.warn("Unable to find link by source for {}", targetResource.getIdElement());
+			}
+
+			mdmLinkBySource.ifPresent(link -> {
+				linkChangeEvent.setMdmMatchResult(link.getMatchResult());
+				linkChangeEvent.setMdmLinkSource(link.getLinkSource());
+				linkChangeEvent.setEidMatch(link.isEidMatchPresent());
+				linkChangeEvent.setNewGoldenResource(link.getHadToCreateNewGoldenResource());
+				linkChangeEvent.setScore(link.getScore());
+				linkChangeEvent.setRuleCount(link.getRuleCount());
+			});
+
 			HookParams params = new HookParams()
 				.add(ResourceOperationMessage.class, outgoingMsg)
 				.add(TransactionLogMessages.class, mdmContext.getTransactionLogMessages())