Merge pull request #7399 from hapifhir/mergeback-3-rel-8-6

Mergeback 3 rel 8 6

Author: jdar8

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_6_0/7387-encounter-everything-not-working-equest-tenat-partitioning.yaml

@@ -0,0 +1,5 @@
+---
+type: fix
+issue: 7387
+title: "Fixed an issue causing resources not being found when running `$everything` operation on `Encounter` resource
+  in `REQUEST_TENANT` partitioning mode."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_6_0/version.yaml

@@ -1,3 +1,3 @@
 ---
 release-date: "2025-11-20"
-codename: "TBD"
+codename: "Euphoria"

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoEncounter.java

@@ -25,9 +25,9 @@
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap.EverythingModeEnum;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 import ca.uhn.fhir.rest.param.StringParam;
-import jakarta.servlet.http.HttpServletRequest;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
@@ -39,12 +39,13 @@ public class JpaResourceDaoEncounter<T extends IBaseResource> extends BaseHapiFh
 
 	@Override
 	public IBundleProvider encounterInstanceEverything(
-			HttpServletRequest theServletRequest,
+			RequestDetails theRequest,
 			IIdType theId,
 			IPrimitiveType<Integer> theCount,
 			IPrimitiveType<Integer> theOffset,
 			DateRangeParam theLastUpdated,
 			SortSpec theSort) {
+
 		SearchParameterMap paramMap = new SearchParameterMap();
 		if (theCount != null) {
 			paramMap.setCount(theCount.getValue());
@@ -63,17 +64,21 @@ public IBundleProvider encounterInstanceEverything(
 		if (theId != null) {
 			paramMap.add("_id", new StringParam(theId.getIdPart()));
 		}
-		IBundleProvider retVal = search(paramMap);
-		return retVal;
+
+		if (!isPagingProviderDatabaseBacked(theRequest)) {
+			paramMap.setLoadSynchronous(true);
+		}
+
+		return search(paramMap, theRequest);
 	}
 
 	@Override
 	public IBundleProvider encounterTypeEverything(
-			HttpServletRequest theServletRequest,
+			RequestDetails theRequest,
 			IPrimitiveType<Integer> theCount,
 			IPrimitiveType<Integer> theOffset,
 			DateRangeParam theLastUpdated,
 			SortSpec theSort) {
-		return encounterInstanceEverything(theServletRequest, null, theCount, theOffset, theLastUpdated, theSort);
+		return encounterInstanceEverything(theRequest, null, theCount, theOffset, theLastUpdated, theSort);
 	}
 }

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounter.java

@@ -30,6 +30,7 @@
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
@@ -40,17 +41,18 @@ public abstract class BaseJpaResourceProviderEncounter<T extends IBaseResource>
 	/**
 	 * Encounter/123/$everything
 	 */
+	@SuppressWarnings("unused")
 	@Operation(name = JpaConstants.OPERATION_EVERYTHING, idempotent = true, bundleType = BundleTypeEnum.SEARCHSET)
 	public IBundleProvider EncounterInstanceEverything(
 			jakarta.servlet.http.HttpServletRequest theServletRequest,
 			@IdParam IIdType theId,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the size of those pages.")
 					@OperationParam(name = Constants.PARAM_COUNT, typeName = "unsignedInt")
 					IPrimitiveType<Integer> theCount,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the offset when fetching a page.")
 					@OperationParam(name = Constants.PARAM_OFFSET, typeName = "unsignedInt")
 					IPrimitiveType<Integer> theOffset,
@@ -59,13 +61,14 @@ public IBundleProvider EncounterInstanceEverything(
 									"Only return resources which were last updated as specified by the given range")
 					@OperationParam(name = Constants.PARAM_LASTUPDATED, min = 0, max = 1)
 					DateRangeParam theLastUpdated,
-			@Sort SortSpec theSortSpec) {
+			@Sort SortSpec theSortSpec,
+			RequestDetails theRequestDetails) {
 
 		startRequest(theServletRequest);
 		try {
 			return ((IFhirResourceDaoEncounter<?>) getDao())
 					.encounterInstanceEverything(
-							theServletRequest, theId, theCount, theOffset, theLastUpdated, theSortSpec);
+							theRequestDetails, theId, theCount, theOffset, theLastUpdated, theSortSpec);
 		} finally {
 			endRequest(theServletRequest);
 		}
@@ -74,16 +77,17 @@ public IBundleProvider EncounterInstanceEverything(
 	/**
 	 * /Encounter/$everything
 	 */
+	@SuppressWarnings("unused")
 	@Operation(name = JpaConstants.OPERATION_EVERYTHING, idempotent = true, bundleType = BundleTypeEnum.SEARCHSET)
 	public IBundleProvider EncounterTypeEverything(
 			jakarta.servlet.http.HttpServletRequest theServletRequest,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the size of those pages.")
 					@OperationParam(name = Constants.PARAM_COUNT, typeName = "unsignedInt")
 					IPrimitiveType<Integer> theCount,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the offset when fetching a page.")
 					@OperationParam(name = Constants.PARAM_OFFSET, typeName = "unsignedInt")
 					IPrimitiveType<Integer> theOffset,
@@ -92,12 +96,13 @@ public IBundleProvider EncounterTypeEverything(
 									"Only return resources which were last updated as specified by the given range")
 					@OperationParam(name = Constants.PARAM_LASTUPDATED, min = 0, max = 1)
 					DateRangeParam theLastUpdated,
-			@Sort SortSpec theSortSpec) {
+			@Sort SortSpec theSortSpec,
+			RequestDetails theRequestDetails) {
 
 		startRequest(theServletRequest);
 		try {
 			return ((IFhirResourceDaoEncounter<?>) getDao())
-					.encounterTypeEverything(theServletRequest, theCount, theOffset, theLastUpdated, theSortSpec);
+					.encounterTypeEverything(theRequestDetails, theCount, theOffset, theLastUpdated, theSortSpec);
 		} finally {
 			endRequest(theServletRequest);
 		}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu2.java

@@ -31,6 +31,7 @@
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 
 public abstract class BaseJpaResourceProviderEncounterDstu2 extends BaseJpaResourceProvider<Encounter> {
@@ -43,12 +44,12 @@ public IBundleProvider EncounterInstanceEverything(
 			jakarta.servlet.http.HttpServletRequest theServletRequest,
 			@IdParam ca.uhn.fhir.model.primitive.IdDt theId,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the size of those pages.")
 					@OperationParam(name = Constants.PARAM_COUNT)
 					ca.uhn.fhir.model.primitive.UnsignedIntDt theCount,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the offset when fetching a page.")
 					@OperationParam(name = Constants.PARAM_OFFSET)
 					ca.uhn.fhir.model.primitive.UnsignedIntDt theOffset,
@@ -57,13 +58,14 @@ public IBundleProvider EncounterInstanceEverything(
 									"Only return resources which were last updated as specified by the given range")
 					@OperationParam(name = Constants.PARAM_LASTUPDATED, min = 0, max = 1)
 					DateRangeParam theLastUpdated,
-			@Sort SortSpec theSortSpec) {
+			@Sort SortSpec theSortSpec,
+			RequestDetails theRequestDetails) {
 
 		startRequest(theServletRequest);
 		try {
 			return ((IFhirResourceDaoEncounter<Encounter>) getDao())
 					.encounterInstanceEverything(
-							theServletRequest, theId, theCount, theOffset, theLastUpdated, theSortSpec);
+							theRequestDetails, theId, theCount, theOffset, theLastUpdated, theSortSpec);
 		} finally {
 			endRequest(theServletRequest);
 		}
@@ -76,12 +78,12 @@ public IBundleProvider EncounterInstanceEverything(
 	public IBundleProvider EncounterTypeEverything(
 			jakarta.servlet.http.HttpServletRequest theServletRequest,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the size of those pages.")
 					@OperationParam(name = Constants.PARAM_COUNT)
 					ca.uhn.fhir.model.primitive.UnsignedIntDt theCount,
 			@Description(
-							formalDefinition =
+							value =
 									"Results from this method are returned across multiple pages. This parameter controls the offset when fetching a page.")
 					@OperationParam(name = Constants.PARAM_OFFSET)
 					ca.uhn.fhir.model.primitive.UnsignedIntDt theOffset,
@@ -90,12 +92,13 @@ public IBundleProvider EncounterTypeEverything(
 									"Only return resources which were last updated as specified by the given range")
 					@OperationParam(name = Constants.PARAM_LASTUPDATED, min = 0, max = 1)
 					DateRangeParam theLastUpdated,
-			@Sort SortSpec theSortSpec) {
+			@Sort SortSpec theSortSpec,
+			RequestDetails theRequestDetails) {
 
 		startRequest(theServletRequest);
 		try {
 			return ((IFhirResourceDaoEncounter<Encounter>) getDao())
-					.encounterTypeEverything(theServletRequest, theCount, theOffset, theLastUpdated, theSortSpec);
+					.encounterTypeEverything(theRequestDetails, theCount, theOffset, theLastUpdated, theSortSpec);
 		} finally {
 			endRequest(theServletRequest);
 		}

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantServerR4Test.java

@@ -70,8 +70,8 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -112,7 +112,7 @@
 public class 	MultitenantServerR4Test extends BaseMultitenantResourceProviderR4Test implements ITestDataBuilder {
 	@Captor
 	private ArgumentCaptor<JpaPid> myMatchUrlCacheValueCaptor;
-	@SpyBean
+	@MockitoSpyBean
 	private MemoryCacheService myMemoryCacheService;
 
 	@Autowired
@@ -183,6 +183,54 @@ public void testPartitioningDoesNotReturnDuplicatesOnPatientEverything(int theCo
 		assertThat(foundIds).hasSize(3);
 	}
 
+	/**
+	 * Tests Encounter/$everything operation with REQUEST_TENANT partitioning
+	 *
+	 * Steps:
+	 * 1. Create Patient in TENANT_A
+	 * 2. Create Encounter in TENANT_A referencing the Patient
+	 * 3. Call Encounter/$everything
+	 * 4. Validate response contains both Encounter and Patient
+	 */
+	@Test
+	public void testEncounterEverything_withRequestTenantPartitioning_shouldReturnEncounterAndPatient() {
+		// Arrange - Set tenant context to TENANT_A
+		myTenantClientInterceptor.setTenantId(TENANT_A);
+
+		// Create Patient in TENANT_A
+		IIdType patient = createPatient(withTenant(TENANT_A), withActiveTrue());
+
+		// Create Encounter in TENANT_A referencing the Patient
+		IIdType encounter = createEncounter(withTenant(TENANT_A), withSubject(patient.toUnqualifiedVersionless().toString()));
+
+		// Act - Call Encounter/$everything
+		Bundle everythingBundle = myClient.operation()
+			.onInstance(encounter.toUnqualifiedVersionless().toString())
+			.named("$everything")
+			.withNoParameters(Parameters.class)
+			.returnResourceType(Bundle.class)
+			.execute();
+
+		// Assert - Should return at least the Encounter and Patient resources
+		assertThat(everythingBundle).isNotNull();
+		assertThat(everythingBundle.getEntry())
+			.as("Encounter/$everything should return at least Encounter and Patient resources")
+			.isNotEmpty()
+			.hasSizeGreaterThanOrEqualTo(2);
+
+		// Verify Encounter is in the bundle
+		boolean hasEncounter = everythingBundle.getEntry().stream()
+			.anyMatch(entry -> entry.getResource() instanceof Encounter
+				&& entry.getResource().getIdElement().getIdPart().equals(encounter.getIdPart()));
+		assertThat(hasEncounter).as("Bundle should contain the Encounter").isTrue();
+
+		// Verify Patient is in the bundle (referenced by Encounter)
+		boolean hasPatient = everythingBundle.getEntry().stream()
+			.anyMatch(entry -> entry.getResource() instanceof Patient
+				&& entry.getResource().getIdElement().getIdPart().equals(patient.getIdPart()));
+		assertThat(hasPatient).as("Bundle should contain the referenced Patient").isTrue();
+	}
+
 	@Test
 	public void testFetchCapabilityStatement() {
 		myTenantClientInterceptor.setTenantId(TENANT_A);
@@ -202,7 +250,7 @@ public void testCreateAndRead_NamedTenant() {
 
 		runInTransaction(() -> {
 			PartitionEntity partition = myPartitionDao.findForName(TENANT_A).orElseThrow(IllegalStateException::new);
-			ResourceTable resourceTable = myResourceTableDao.findById(idA.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			ResourceTable resourceTable = myResourceTableDao.findById(JpaPid.fromId(idA.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
             assert resourceTable.getPartitionId().getPartitionId() != null;
             assertEquals(partition.getId(), resourceTable.getPartitionId().getPartitionId());
 		});
@@ -240,7 +288,7 @@ public void testCreateAndRead_DefaultTenant() {
 		createPatient(withTenant(TENANT_B), withActiveFalse());
 
 		runInTransaction(() -> {
-			ResourceTable resourceTable = myResourceTableDao.findById(idA.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			ResourceTable resourceTable = myResourceTableDao.findById(JpaPid.fromId(idA.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
 			assertNull(resourceTable.getPartitionId().getPartitionId());
 		});
 
@@ -460,7 +508,7 @@ public void testCreateAndRead_NonPartitionableResource_DefaultTenant() {
 		IIdType idA = createResource("NamingSystem", withTenant(JpaConstants.DEFAULT_PARTITION_NAME), withStatus("draft"));
 
 		runInTransaction(() -> {
-			ResourceTable resourceTable = myResourceTableDao.findById(idA.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			ResourceTable resourceTable = myResourceTableDao.findById(JpaPid.fromId(idA.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
 			assertNull(resourceTable.getPartitionId().getPartitionId());
 		});
 
@@ -514,10 +562,10 @@ public void testTransaction() {
 		IdType idB = new IdType(response.getEntry().get(1).getResponse().getLocation());
 
 		runInTransaction(() -> {
-			ResourceTable resourceTable = myResourceTableDao.findById(idA.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			ResourceTable resourceTable = myResourceTableDao.findById(JpaPid.fromId(idA.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
             assert resourceTable.getPartitionId().getPartitionId() != null;
             assertEquals(1, resourceTable.getPartitionId().getPartitionId());
-			resourceTable = myResourceTableDao.findById(idB.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			resourceTable = myResourceTableDao.findById(JpaPid.fromId(idB.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
             assert resourceTable.getPartitionId().getPartitionId() != null;
             assertEquals(1, resourceTable.getPartitionId().getPartitionId());
 		});
@@ -702,9 +750,9 @@ public void testDirectDaoAccess_PartitionInRequestDetails_Create() {
 		IIdType idB = myPatientDao.create((Patient) patientB, requestDetails).getId();
 
 		runInTransaction(() -> {
-			ResourceTable resourceTable = myResourceTableDao.findById(idA.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			ResourceTable resourceTable = myResourceTableDao.findById(JpaPid.fromId(idA.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
 			assertNull(resourceTable.getPartitionId().getPartitionId());
-			resourceTable = myResourceTableDao.findById(idB.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			resourceTable = myResourceTableDao.findById(JpaPid.fromId(idB.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
             assert resourceTable.getPartitionId().getPartitionId() != null;
             assertEquals(2, resourceTable.getPartitionId().getPartitionId());
 		});
@@ -769,9 +817,9 @@ public void testDirectDaoAccess_PartitionInRequestDetails_Update() {
 		myPatientDao.update((Patient) patientB, requestDetails);
 
 		runInTransaction(() -> {
-			ResourceTable resourceTable = myResourceTableDao.findById(idA.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			ResourceTable resourceTable = myResourceTableDao.findById(JpaPid.fromId(idA.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
 			assertNull(resourceTable.getPartitionId().getPartitionId());
-			resourceTable = myResourceTableDao.findById(idB.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			resourceTable = myResourceTableDao.findById(JpaPid.fromId(idB.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
             assert resourceTable.getPartitionId().getPartitionId() != null;
             assertEquals(2, resourceTable.getPartitionId().getPartitionId());
 		});
@@ -833,10 +881,10 @@ public void testDirectDaoAccess_PartitionInRequestDetails_Transaction() {
 		IdType idB = new IdType(response.getEntry().get(1).getResponse().getLocation());
 
 		runInTransaction(() -> {
-			ResourceTable resourceTable = myResourceTableDao.findById(idA.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			ResourceTable resourceTable = myResourceTableDao.findById(JpaPid.fromId(idA.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
             assert resourceTable.getPartitionId().getPartitionId() != null;
             assertEquals(1, resourceTable.getPartitionId().getPartitionId());
-			resourceTable = myResourceTableDao.findById(idB.getIdPartAsLong()).orElseThrow(IllegalStateException::new);
+			resourceTable = myResourceTableDao.findById(JpaPid.fromId(idB.getIdPartAsLong())).orElseThrow(IllegalStateException::new);
             assert resourceTable.getPartitionId().getPartitionId() != null;
             assertEquals(1, resourceTable.getPartitionId().getPartitionId());
 		});

hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java

@@ -21,24 +21,24 @@
 
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.param.DateRangeParam;
-import jakarta.servlet.http.HttpServletRequest;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 public interface IFhirResourceDaoEncounter<T extends IBaseResource> extends IFhirResourceDao<T> {
 
 	IBundleProvider encounterInstanceEverything(
-			HttpServletRequest theServletRequest,
+			RequestDetails theRequest,
 			IIdType theId,
 			IPrimitiveType<Integer> theCount,
 			IPrimitiveType<Integer> theOffset,
 			DateRangeParam theLastUpdate,
 			SortSpec theSort);
 
 	IBundleProvider encounterTypeEverything(
-			HttpServletRequest theServletRequest,
+			RequestDetails theRequest,
 			IPrimitiveType<Integer> theCount,
 			IPrimitiveType<Integer> theOffset,
 			DateRangeParam theLastUpdated,