initial implementation

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java

@@ -188,6 +188,7 @@ public class Constants {
 	public static final String PARAM_SOURCE = "_source";
 	public static final String PARAM_SUMMARY = "_summary";
 	public static final String PARAM_TAG = "_tag";
+	public static final String PARAM_LIST = "_list";
 	public static final String PARAM_TAGS = "_tags";
 	public static final String PARAM_TEXT = "_text";
 	public static final String PARAM_VALIDATE = "_validate";

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

@@ -57,6 +57,7 @@ import ca.uhn.fhir.jpa.searchparam.MatchUrlService;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.jpa.util.JpaInterceptorBroadcaster;
 import ca.uhn.fhir.model.api.IQueryParameterType;
+import ca.uhn.fhir.model.dstu2.resource.ListResource;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.CacheControlDirective;
 import ca.uhn.fhir.rest.api.Constants;
@@ -73,6 +74,7 @@ import ca.uhn.fhir.rest.api.server.SimplePreResourceAccessDetails;
 import ca.uhn.fhir.rest.api.server.SimplePreResourceShowDetails;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import ca.uhn.fhir.rest.api.server.storage.TransactionDetails;
+import ca.uhn.fhir.rest.param.HasParam;
 import ca.uhn.fhir.rest.server.IPagingProvider;
 import ca.uhn.fhir.rest.server.IRestfulServerDefaults;
 import ca.uhn.fhir.rest.server.RestfulServerUtils;
@@ -120,12 +122,12 @@ import javax.annotation.PostConstruct;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -1301,7 +1303,56 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
 			}
 		}
 
-		// Notify interceptors
+		translateSearchParams(theParams);
+
+		notifySearchInterceptors(theParams, theRequest);
+
+		CacheControlDirective cacheControlDirective = new CacheControlDirective();
+		if (theRequest != null) {
+			cacheControlDirective.parse(theRequest.getHeaders(Constants.HEADER_CACHE_CONTROL));
+		}
+
+		RequestPartitionId requestPartitionId = myPartitionHelperSvc.determineReadPartitionForRequest(theRequest, getResourceName());
+		IBundleProvider retVal = mySearchCoordinatorSvc.registerSearch(this, theParams, getResourceName(), cacheControlDirective, theRequest, requestPartitionId);
+
+		if (retVal instanceof PersistedJpaBundleProvider) {
+			PersistedJpaBundleProvider provider = (PersistedJpaBundleProvider) retVal;
+			if (provider.getCacheStatus() == SearchCacheStatusEnum.HIT) {
+				if (theServletResponse != null && theRequest != null) {
+					String value = "HIT from " + theRequest.getFhirServerBase();
+					theServletResponse.addHeader(Constants.HEADER_X_CACHE, value);
+				}
+			}
+		}
+
+		return retVal;
+	}
+
+	private void translateSearchParams(SearchParameterMap theParams) {
+		Iterator<String> keyIterator = theParams.keySet().iterator();
+
+		// Translate _list=42 to _has=List:item:_id=42
+		while (keyIterator.hasNext()) {
+			String key = keyIterator.next();
+			if (Constants.PARAM_LIST.equals((key))) {
+				List<List<IQueryParameterType>> andOrValues = theParams.get(key);
+				// FIXME KH generalize this to properly support and and or and write tests for both
+				// FIXME KH this is a hack to test it out in theory
+				theParams.remove(key);
+				List<List<IQueryParameterType>> hasParamValues = new ArrayList<>();
+				for (List<IQueryParameterType> orValues : andOrValues) {
+					List<IQueryParameterType> orList = new ArrayList<>();
+					for (IQueryParameterType value : orValues) {
+						orList.add(new HasParam("List", ListResource.SP_ITEM, ListResource.SP_RES_ID, value.getValueAsQueryToken(null)));
+					}
+					hasParamValues.add(orList);
+				}
+				theParams.put(Constants.PARAM_HAS, hasParamValues);
+			}
+		}
+	}
+
+	private void notifySearchInterceptors(SearchParameterMap theParams, RequestDetails theRequest) {
 		if (theRequest != null) {
 			ActionRequestDetails requestDetails = new ActionRequestDetails(theRequest, getContext(), getResourceName(), null);
 			notifyInterceptors(RestOperationTypeEnum.SEARCH_TYPE, requestDetails);
@@ -1335,26 +1386,6 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
 				theParams.setCount(theRequest.getServer().getDefaultPageSize());
 			}
 		}
-
-		CacheControlDirective cacheControlDirective = new CacheControlDirective();
-		if (theRequest != null) {
-			cacheControlDirective.parse(theRequest.getHeaders(Constants.HEADER_CACHE_CONTROL));
-		}
-
-		RequestPartitionId requestPartitionId = myPartitionHelperSvc.determineReadPartitionForRequest(theRequest, getResourceName());
-		IBundleProvider retVal = mySearchCoordinatorSvc.registerSearch(this, theParams, getResourceName(), cacheControlDirective, theRequest, requestPartitionId);
-
-		if (retVal instanceof PersistedJpaBundleProvider) {
-			PersistedJpaBundleProvider provider = (PersistedJpaBundleProvider) retVal;
-			if (provider.getCacheStatus() == SearchCacheStatusEnum.HIT) {
-				if (theServletResponse != null && theRequest != null) {
-					String value = "HIT from " + theRequest.getFhirServerBase();
-					theServletResponse.addHeader(Constants.HEADER_X_CACHE, value);
-				}
-			}
-		}
-
-		return retVal;
 	}
 
 	@Override

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchListTest.java

@@ -3,6 +3,7 @@ package ca.uhn.fhir.jpa.dao.r4;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.param.HasParam;
 import ca.uhn.fhir.rest.param.StringParam;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 
 import java.util.List;
 
+import static ca.uhn.fhir.rest.api.Constants.PARAM_HAS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 
@@ -34,13 +36,27 @@ public class FhirResourceDaoSearchListTest extends BaseJpaR4Test {
 		ListResource list = new ListResource();
 		list.addEntry().getItem().setReferenceElement(pid1);
 		list.addEntry().getItem().setReferenceElement(pid2);
-		IIdType listId = myListResourceDao.create(list).getId();
+		String listIdString = myListResourceDao.create(list).getId().getValue();
 
-		SearchParameterMap map = SearchParameterMap.newSynchronous();
+		{
-		map.add("_list", new StringParam(listId.getValue()));
+			// What we need to emulate
-		IBundleProvider bundle = myPatientDao.search(map);
+			// /Patient?_has=List:item:_id=123
-		List<IBaseResource> resources = bundle.getResources(0, 1);
+			SearchParameterMap map = SearchParameterMap.newSynchronous();
-		assertThat(resources, hasSize(2));
+			// 	public HasParam(String theTargetResourceType, String theReferenceFieldName, String theParameterName, String theParameterValue) {
-		// assert ids equal pid1 and pid2
+			map.add(PARAM_HAS, new HasParam("List", "item", "_id", listIdString));
+			IBundleProvider bundle = myPatientDao.search(map);
+			List<IBaseResource> resources = bundle.getResources(0, 2);
+			assertThat(resources, hasSize(2));
+		}
+
+		{
+			// The new syntax
+			SearchParameterMap map = SearchParameterMap.newSynchronous();
+			map.add("_list", new StringParam(listIdString));
+			IBundleProvider bundle = myPatientDao.search(map);
+			List<IBaseResource> resources = bundle.getResources(0, 2);
+			assertThat(resources, hasSize(2));
+			// assert ids equal pid1 and pid2
+		}
 	}
 }