Fix bug and add test for SP Validating Interceptor (#3930)

hapifhir · Aug 17, 2022 · 28b09a7 · 28b09a7
1 parent 8732469
commit 28b09a7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 6 deletions.
diff --git a/...tilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java b/...tilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java
@@ -476,7 +476,30 @@ public void testSearchParamValidatingInterceptorAllowsResourceUpdate(){
  .execute();
 
  assertNotNull(methodOutcome);
+ }
+ @Test
+ public void testSearchParamValidationOnUpdateWithClientAssignedId() {
+ registerSearchParameterValidatingInterceptor();
+
+ SearchParameter searchParameter = createSearchParameter();
+ searchParameter.setId("my-custom-id");
+
+ // now, create a SearchParameter
+ MethodOutcome methodOutcome = myClient
+ .update()
+ .resource(searchParameter)
+ .execute();
 
+ assertTrue(methodOutcome.getCreated());
+ SearchParameter createdSearchParameter = (SearchParameter) methodOutcome.getResource();
+
+ createdSearchParameter.setUrl("newUrl");
+ methodOutcome = myClient
+ .update()
+ .resource(createdSearchParameter)
+ .execute();
+
+ assertNotNull(methodOutcome);
  }
 
  @Test

diff --git a/...java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamValidatingInterceptor.java b/...java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamValidatingInterceptor.java
@@ -28,8 +28,10 @@
 import ca.uhn.fhir.interceptor.api.Pointcut;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
+import ca.uhn.fhir.jpa.api.svc.IIdHelperService;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.jpa.searchparam.registry.SearchParameterCanonicalizer;
+import ca.uhn.fhir.rest.api.server.IBundleProvider;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import ca.uhn.fhir.rest.param.TokenAndListParam;
@@ -39,7 +41,10 @@
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -55,6 +60,8 @@ public class SearchParamValidatingInterceptor {
 
  private DaoRegistry myDaoRegistry;
 
+ private IIdHelperService myIdHelperService;
+
  @Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_CREATED)
  public void resourcePreCreate(IBaseResource theResource, RequestDetails theRequestDetails) {
  validateSearchParamOnCreate(theResource, theRequestDetails);
@@ -90,15 +97,15 @@ public void validateSearchParamOnUpdate(IBaseResource theResource, RequestDetail
 
  SearchParameterMap searchParameterMap = extractSearchParameterMap(runtimeSearchParam);
 
- List<ResourcePersistentId> persistedIdList = getDao().searchForIds(searchParameterMap, theRequestDetails);
+ List<ResourcePersistentId> pidList = getDao().searchForIds(searchParameterMap, theRequestDetails);
 
- if(isNotEmpty(persistedIdList)){
- String resourceId = runtimeSearchParam.getId().getIdPart();
+ if(isNotEmpty(pidList)){
+ Set<String> resolvedResourceIds = myIdHelperService.translatePidsToFhirResourceIds(new HashSet<>(pidList));
+ String incomingResourceId = runtimeSearchParam.getId().getIdPart();
 
- boolean isNewSearchParam = persistedIdList
+ boolean isNewSearchParam = resolvedResourceIds
  .stream()
- .map(theResourcePersistentId -> theResourcePersistentId.getId().toString())
- .noneMatch(anId -> anId.equals(resourceId));
+ .noneMatch(resId -> resId.equals(incomingResourceId));
 
  if(isNewSearchParam){
  throw new UnprocessableEntityException(Msg.code(2125) + "Can't process submitted SearchParameter as it is overlapping an existing one.");
@@ -140,6 +147,11 @@ public void setDaoRegistry(DaoRegistry theDaoRegistry) {
  myDaoRegistry = theDaoRegistry;
  }
 
+ @Autowired
+ public void setIIDHelperService(IIdHelperService theIdHelperService) {
+ myIdHelperService = theIdHelperService;
+ }
+
  private IFhirResourceDao getDao() {
  return myDaoRegistry.getResourceDao(SEARCH_PARAM);
  }