Ensure that generic partition ID computation work for ServletRequestDetails. (#7377)

* Ensure that generic partition ID computation work for ServlertRequestDetails.

* Add test that proves this works and fails if I revert the production code.

* Add changelog.

Author: lukedegruchy

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_6_0/7378-fix-request-any-partitioning.yaml

@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 7378
+title: "The STORAGE_PARTITION_IDENTIFY_ANY hook was recently removed from RequestTenantPartitionInterceptor which caused BaseRequestPartitionHelperSvc.determineGenericPartitionForRequest() to fail in Request Tenant mode. This change restores the functionality of BaseRequestPartitionHelperSvc.determineGenericPartitionForRequest() by falling back to STORAGE_PARTITION_IDENTIFY_READ if STORAGE_PARTITION_IDENTIFY_ANY is not set."

hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/interceptor/model/ReadPartitionIdRequestDetails.java

@@ -21,6 +21,7 @@
 
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -67,6 +68,17 @@ private ReadPartitionIdRequestDetails(
 		myExtendedOperationName = theExtendedOperationName;
 	}
 
+	public static ReadPartitionIdRequestDetails forGeneric(RequestDetails theRequestDetails) {
+		return new ReadPartitionIdRequestDetails(
+				theRequestDetails.getResourceName(),
+				theRequestDetails.getRestOperationType(),
+				theRequestDetails.getId(),
+				null,
+				null,
+				null,
+				null);
+	}
+
 	@Nullable
 	public String getExtendedOperationName() {
 		return myExtendedOperationName;

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

@@ -5,6 +5,7 @@
 import ca.uhn.fhir.batch2.model.JobInstance;
 import ca.uhn.fhir.batch2.model.StatusEnum;
 import ca.uhn.fhir.i18n.Msg;
+import ca.uhn.fhir.interceptor.model.RequestPartitionId;
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
 import ca.uhn.fhir.jpa.api.model.BulkExportJobResults;
 import ca.uhn.fhir.jpa.batch.models.Batch2JobStartResponse;
@@ -16,9 +17,11 @@
 import ca.uhn.fhir.jpa.model.dao.JpaPid;
 import ca.uhn.fhir.jpa.model.entity.ResourceTable;
 import ca.uhn.fhir.jpa.model.util.JpaConstants;
+import ca.uhn.fhir.jpa.partition.IRequestPartitionHelperSvc;
 import ca.uhn.fhir.jpa.util.MemoryCacheService;
 import ca.uhn.fhir.model.api.Include;
 import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
 import ca.uhn.fhir.rest.api.server.bulk.BulkExportJobParameters;
@@ -66,6 +69,7 @@
 import org.mockito.Captor;
 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;
 
@@ -111,6 +115,9 @@ public class 	MultitenantServerR4Test extends BaseMultitenantResourceProviderR4T
 	@SpyBean
 	private MemoryCacheService myMemoryCacheService;
 
+	@Autowired
+	IRequestPartitionHelperSvc myRequestPartitionHelperSvc;
+
 	@Override
 	@AfterEach
 	public void after() throws Exception {
@@ -876,6 +883,19 @@ public void testIncludeInTenantWithAutoGeneratedID() {
 		assertThat(response.getEntry()).hasSize(2);
 	}
 
+	@Test
+	public void testDetermineGenericPartitionForRequest() {
+		ServletRequestDetails request = mock(ServletRequestDetails.class);
+		when(request.getResourceName()).thenReturn("MeasureReport");
+		when(request.getRestOperationType()).thenReturn(RestOperationTypeEnum.CREATE);
+		when(request.getId()).thenReturn(new IdType("Measure", "123"));
+		when(request.getTenantId()).thenReturn(TENANT_A);
+		RequestPartitionId result = myRequestPartitionHelperSvc.determineGenericPartitionForRequest(request);
+		assertThat(result).isNotNull();
+		assertThat(result.getPartitionIds()).contains(1);
+		assertThat(result.getPartitionNames()).contains(TENANT_A);
+	}
+
 	private void createConditionWithAllowedUnqualified(IIdType idA) {
 		myPartitionSettings.setAllowReferencesAcrossPartitions(PartitionSettings.CrossPartitionReferenceMode.ALLOWED_UNQUALIFIED);
 		IIdType idB = createResource("Condition", withTenant(TENANT_A), withObservationCode("http://cs", "A"));

hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/partition/BaseRequestPartitionHelperSvc.java

@@ -220,6 +220,9 @@ && systemRequestHasExplicitPartition(systemRequestDetails)) {
 					myInterceptorBroadcaster, theRequestDetails);
 			if (compositeBroadcaster.hasHooks(Pointcut.STORAGE_PARTITION_IDENTIFY_ANY)) {
 				requestPartitionId = callAnyPointcut(compositeBroadcaster, theRequestDetails);
+			} else if (compositeBroadcaster.hasHooks(Pointcut.STORAGE_PARTITION_IDENTIFY_READ)) {
+				ReadPartitionIdRequestDetails readDetails = ReadPartitionIdRequestDetails.forGeneric(theRequestDetails);
+				requestPartitionId = callReadPointcut(compositeBroadcaster, theRequestDetails, readDetails);
 			}
 		}