Skip to content

Bug Fix in PackageInstallerSvcImpl when using MultiTenancy #7092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug Fix in PackageInstallerSvcImpl when using MultiTenancy #7092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ public PackageInstallOutcomeJson install(PackageInstallationSpec theInstallation

boolean exists = myTxService
.withSystemRequest()
.withRequestPartitionId(RequestPartitionId.defaultPartition())
.withRequestPartitionId(
RequestPartitionId.fromPartitionId(myPartitionSettings.getDefaultPartitionId()))
.execute(() -> {
Optional<NpmPackageVersionEntity> existing = myPackageVersionDao.findByPackageIdAndVersion(
theInstallationSpec.getName(), theInstallationSpec.getVersion());
Expand Down Expand Up @@ -524,7 +525,8 @@ private DaoMethodOutcome updateResource(IFhirResourceDao theDao, IBaseResource t
private RequestDetails createRequestDetails() {
SystemRequestDetails requestDetails = new SystemRequestDetails();
if (myPartitionSettings.isPartitioningEnabled()) {
requestDetails.setRequestPartitionId(RequestPartitionId.defaultPartition());
requestDetails.setRequestPartitionId(
RequestPartitionId.fromPartitionId(myPartitionSettings.getDefaultPartitionId()));
}
return requestDetails;
}
Expand Down
52 changes: 52 additions & 0 deletions ...ir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.FhirVersionEnum;
import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.interceptor.model.RequestPartitionId;
import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
Expand All @@ -17,6 +18,7 @@
import ca.uhn.fhir.jpa.searchparam.util.SearchParameterHelper;
import ca.uhn.fhir.mdm.log.Logs;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
import ca.uhn.fhir.rest.server.SimpleBundleProvider;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.hapi.converters.canonical.VersionCanonicalizer;
Expand Down Expand Up @@ -65,6 +67,7 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
Expand Down Expand Up @@ -317,6 +320,55 @@ public void testCreateOrUpdate_withSearchParameter(String theExistingId, Collect
assertEquals(theInstallBase, capturedSP.getBase().stream().map(CodeType::getCode).toList());
}

@Test
void testInstall_WithPartitioningEnabled_UsesDefaultPartition() throws IOException {

myPartitionSettings.setPartitioningEnabled(true);
myPartitionSettings.setDefaultPartitionId(0);

CodeSystem codeSystem = new CodeSystem();
codeSystem.setId("CodeSystem/test-cs");
codeSystem.setUrl("http://example.com/test-codesystem");
codeSystem.setStatus(Enumerations.PublicationStatus.ACTIVE);

PackageInstallationSpec spec = setupResourceInPackage(null, codeSystem, myCodeSystemDao);

mySvc.install(spec);

verify(myCodeSystemDao, times(1)).search(any(SearchParameterMap.class), myRequestDetailsCaptor.capture());
verify(myCodeSystemDao, times(1)).update(any(CodeSystem.class), myRequestDetailsCaptor.capture());

List<RequestDetails> allRequestDetails = myRequestDetailsCaptor.getAllValues();
RequestPartitionId defaultPartitionId = RequestPartitionId.fromPartitionId(myPartitionSettings.getDefaultPartitionId());
for (RequestDetails requestDetails : allRequestDetails) {
SystemRequestDetails systemRequest = (SystemRequestDetails) requestDetails;
assertEquals(defaultPartitionId, systemRequest.getRequestPartitionId());
}
}

@Test
void testInstall_WithPartitioningDisabled_NoPartitionSet() throws IOException {
myPartitionSettings.setPartitioningEnabled(false);

CodeSystem codeSystem = new CodeSystem();
codeSystem.setId("CodeSystem/test-cs");
codeSystem.setUrl("http://example.com/test-codesystem");
codeSystem.setStatus(Enumerations.PublicationStatus.ACTIVE);

PackageInstallationSpec spec = setupResourceInPackage(null, codeSystem, myCodeSystemDao);

mySvc.install(spec);

verify(myCodeSystemDao, times(1)).search(any(SearchParameterMap.class), myRequestDetailsCaptor.capture());
verify(myCodeSystemDao, times(1)).update(any(CodeSystem.class), myRequestDetailsCaptor.capture());

List<RequestDetails> allRequestDetails = myRequestDetailsCaptor.getAllValues();
for (RequestDetails requestDetails : allRequestDetails) {
SystemRequestDetails systemRequest = (SystemRequestDetails) requestDetails;
assertNull(systemRequest.getRequestPartitionId());
}
}

private PackageInstallationSpec setupResourceInPackage(IBaseResource myExistingResource, IBaseResource myInstallResource,
IFhirResourceDao myFhirResourceDao) throws IOException {
NpmPackage pkg = createPackage(myInstallResource, myInstallResource.getClass().getSimpleName());
Expand Down
Loading