Merge pull request #1833 from IBM/issue-1831

Signed-off-by: Lee Surprenant <[email protected]>

Author: lmsurpre

fhir-search/src/main/java/com/ibm/fhir/search/util/SearchUtil.java

@@ -444,9 +444,13 @@ public static SearchParameter getSearchParameter(String resourceType, String cod
             // If we found it within the built-in search parameters, apply our filtering rules.
             if (result != null) {
 
+                // Check if this search parameter applies to the base Resource type
                 ResourceType rt = result.getBase().get(0).as(ResourceType.class);
+                if (SearchConstants.RESOURCE_RESOURCE.equals(rt.getValue())) {
+                    resourceType = rt.getValue();
+                }
                 Collection<SearchParameter> filteredResult =
-                        filterSearchParameters(getFilterRules(), rt.getValue(), Collections.singleton(result));
+                        filterSearchParameters(getFilterRules(), resourceType, Collections.singleton(result));
 
                 // If our filtered result is non-empty, then just return the first (and only) item.
                 result = (filteredResult.isEmpty() ? null : filteredResult.iterator().next());
@@ -509,9 +513,14 @@ public static SearchParameter getSearchParameter(String resourceType, Canonical
 
             // If we found it within the built-in search parameters, apply our filtering rules.
             if (result != null) {
-                ResourceType rt = result.getBase().get(0);
+
+                // Check if this search parameter applies to the base Resource type
+                ResourceType rt = result.getBase().get(0).as(ResourceType.class);
+                if (SearchConstants.RESOURCE_RESOURCE.equals(rt.getValue())) {
+                    resourceType = rt.getValue();
+                }
                 Collection<SearchParameter> filteredResult =
-                        filterSearchParameters(getFilterRules(), rt.getValue(), Collections.singleton(result));
+                        filterSearchParameters(getFilterRules(), resourceType, Collections.singleton(result));
 
                 // If our filtered result is non-empty, then just return the first (and only) item.
                 result = (filteredResult.isEmpty() ? null : filteredResult.iterator().next());

fhir-search/src/test/java/com/ibm/fhir/search/parameters/MultiTenantSearchParameterTest.java

@@ -274,6 +274,12 @@ public void testGetSearchParameter11() throws Exception {
         assertNotNull(result);
     }
 
+    @Test
+    public void testGetSearchParameter12() throws Exception {
+        SearchParameter result = SearchUtil.getSearchParameter("FamilyMemberHistory", "code");
+        assertNotNull(result);
+    }
+
     @Test
     void testDynamicSearchParameters1() throws Exception {
         // Test behavior of dynamic updates to search parameters.

fhir-search/src/test/resources/config/default/fhir-server-config.json

@@ -1,5 +1,13 @@
 {
     "__comment": "FHIR Server configuration",
     "fhirServer": {
+        "resources": {
+            "open": true,
+            "FamilyMemberHistory": {
+                "searchParameters": {
+                    "code": "http://hl7.org/fhir/SearchParameter/clinical-code"
+                }
+            }
+        }
     }
 }