[7332] Fix $mdm-query-links in partition mode (#7333)

* [7332] update mdm resource persistence id

* [7332] add tests and changelog

* [7332] update changelog

* [7332] update test

* [7332] update test

* [7332] update changelog

Author: YalingPeiS

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_6_0/7332-fix-query-mdm-links-not-return-resources.yaml

@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 7332
+title: "In partition mode, the FHIR endpoint GET `$mdm-query-links` returned a 404 Not Found error when both source
+and golden resources existed in the partition. This has now been fixed."
+

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java

@@ -245,7 +245,7 @@ public MdmLink setId(JpaPid theId) {
 
 	@Override
 	public JpaPid getGoldenResourcePersistenceId() {
-		return JpaPid.fromId(myGoldenResourcePid);
+		return JpaPid.fromId(myGoldenResourcePid, myGoldenResourcePartitionId);
 	}
 
 	@Override
@@ -260,7 +260,7 @@ public IMdmLink setGoldenResourcePersistenceId(JpaPid theGoldenResourcePid) {
 
 	@Override
 	public JpaPid getSourcePersistenceId() {
-		return JpaPid.fromId(mySourcePid);
+		return JpaPid.fromId(mySourcePid, mySourcePartitionId);
 	}
 
 	@Override
@@ -465,6 +465,8 @@ public String toString() {
 				.append("myScore", myScore)
 				.append("myRuleCount", myRuleCount)
 				.append("myPartitionId", getPartitionId())
+				.append("mySourcePartitionId", mySourcePartitionId)
+				.append("myGoldenResourcePartitionId", myGoldenResourcePartitionId)
 				.toString();
 	}
 

hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderCrossPartitionR4Test.java

@@ -1,18 +1,27 @@
 package ca.uhn.fhir.jpa.mdm.provider;
 
 import ca.uhn.fhir.interceptor.model.RequestPartitionId;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.jpa.entity.PartitionEntity;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.mdm.util.MdmResourceUtil;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
+import ca.uhn.fhir.rest.server.interceptor.partition.RequestTenantPartitionInterceptor;
+import org.hl7.fhir.dstu3.model.UnsignedIntType;
 import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.DecimalType;
+import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Patient;
+import org.hl7.fhir.r4.model.StringType;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
@@ -21,14 +30,16 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class MdmProviderCrossPartitionR4Test extends BaseProviderR4Test{
+public class MdmProviderCrossPartitionR4Test extends BaseProviderR4Test {
 	@Autowired
 	private IMdmSettings myMdmSettings;
 
 	private static final String PARTITION_GOLDEN_RESOURCE = "PARTITION-GOLDEN";
 
+	private RequestTenantPartitionInterceptor requestTenantPartitionInterceptor;
+
 	@Override
-    @BeforeEach
+	@BeforeEach
 	public void before() throws Exception {
 		super.before();
 
@@ -37,6 +48,10 @@ public void before() throws Exception {
 		myPartitionLookupSvc.createPartition(new PartitionEntity().setId(1).setName(PARTITION_1), null);
 		myPartitionLookupSvc.createPartition(new PartitionEntity().setId(2).setName(PARTITION_2), null);
 		myPartitionLookupSvc.createPartition(new PartitionEntity().setId(3).setName(PARTITION_GOLDEN_RESOURCE), null);
+
+		requestTenantPartitionInterceptor = new RequestTenantPartitionInterceptor();
+		requestTenantPartitionInterceptor.setPartitionSettings(myPartitionSettings);
+		myInterceptorRegistry.registerInterceptor(requestTenantPartitionInterceptor);
 	}
 
 	@Override
@@ -47,6 +62,7 @@ public void after() throws IOException {
 		myPartitionSettings.setPartitioningEnabled(false);
 		myMdmSettings.setSearchAllPartitionForMatch(false);
 		myMdmSettings.setGoldenResourcePartitionName("");
+		myInterceptorRegistry.unregisterInterceptor(requestTenantPartitionInterceptor);
 	}
 
 
@@ -69,7 +85,7 @@ public void testCreateLinkWithMatchResultOnDifferentPartitionsWithoutSearchAllPa
 	}
 
 	@Test
-	public void testCreateLinkWithResourcesInSpecificPartition(){
+	public void testCreateLinkWithResourcesInSpecificPartition() {
 		myMdmSettings.setGoldenResourcePartitionName(PARTITION_GOLDEN_RESOURCE);
 		myMdmSettings.setSearchAllPartitionForMatch(true);
 
@@ -88,4 +104,33 @@ public void testCreateLinkWithResourcesInSpecificPartition(){
 
 		assertTrue(MdmResourceUtil.isGoldenRecord(searchResult.getAllResources().get(0)));
 	}
+
+	@ParameterizedTest
+	@CsvSource(value = {
+		"false,    '',	                  1",  // Golden resource in same partition as source
+		"true,     PARTITION-GOLDEN,      3"   // Golden resource in different partition than source
+	})
+	void testQueryMdmLinkWithPartition(boolean theSearchAllPartitions, String theGoldenResPartitionName, int theGoldenResPartitionId) {
+		myMdmSettings.setSearchAllPartitionForMatch(theSearchAllPartitions);
+		myMdmSettings.setGoldenResourcePartitionName(theGoldenResPartitionName);
+
+		Patient jane = createPatientOnPartition(buildJanePatient(), RequestPartitionId.fromPartitionId(1));
+		MdmTransactionContext mdmContext =
+			myMdmMatchLinkSvc.updateMdmLinksForMdmSource(jane, createContextForCreate("Patient"));
+
+		MdmLink mdmLink = (MdmLink) mdmContext.getMdmLinks().get(0);
+		assertThat(mdmLink.getSourcePersistenceId().getPartitionId()).isEqualTo(1);
+		assertThat(mdmLink.getGoldenResourcePersistenceId().getPartitionId()).isEqualTo(theGoldenResPartitionId);
+
+		myRequestDetails.setTenantId(PARTITION_1);
+		Parameters result = (Parameters) myMdmProvider.queryLinks(null, null, null, null, new UnsignedIntType(0),
+			new UnsignedIntType(10), new StringType(), myRequestDetails, new StringType("Patient"));
+
+		assertThat(result.getParameter()).hasSize(3);
+		assertThat(result.getParameter().get(0).getName()).isEqualTo("self");
+		assertThat(result.getParameter().get(1).getName()).isEqualTo("total");
+		assertThat(((DecimalType) (result.getParameter().get(1).getValue())).getValueAsInteger()).isEqualTo(1);
+		assertThat(result.getParameter().get(2).getName()).isEqualTo("link");
+		assertThat(result.getParameter().get(2).getPart()).isNotEmpty();
+	}
 }