Fix a regression in Valueset Expansion (#5993)

* Add forgotten ISA * revert non-standard property behaviour on is-a match type * Changelog
hapifhir · Jun 8, 2024 · 4321670 · 4321670
1 parent 590fe26
commit 4321670
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/...-resource-more-than-one-search-param.yaml → ...-resource-more-than-one-search-param.yaml b/...-resource-more-than-one-search-param.yaml → ...-resource-more-than-one-search-param.yaml
diff --git a/...c/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5993-valueset-expansion-regression.yaml b/...c/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5993-valueset-expansion-regression.yaml
@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 5993
+title: "Corrected a regression in valueset expansion. If a valueset with a non-standard `property` in the filter used the `is-a` operation, the caller would receive `HAPI-2526`. This has been corrected."
+
+
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java
@@ -1452,6 +1452,7 @@ private void handleFilterPropertyDefault(
  } else {
  Term term = new Term(CONCEPT_PROPERTY_PREFIX_NAME + theFilter.getProperty(), value);
  switch (theFilter.getOp()) {
+ case ISA:
  case EQUAL:
  theB.must(theF.match().field(term.field()).matching(term.text()));
  break;

diff --git a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java
@@ -401,6 +401,7 @@ public void create100ConceptsCodeSystemAndValueSet() {
  createConceptsCodeSystemAndValueSet(100);
  }
 
+
  public IIdType createConceptsCodeSystemAndValueSet(int theCount) {
  CodeSystem cs = new CodeSystem();
  cs.setUrl("http:https://foo/cs");

diff --git a/hapi-fhir-jpaserver-test-r4/src/test/resources/largecodesystem/ValueSetV.json b/hapi-fhir-jpaserver-test-r4/src/test/resources/largecodesystem/ValueSetV.json
@@ -13,7 +13,7 @@
  "system": "http:https://hl7.org/fhir/sid/icd-10",
  "filter": [
  {
- "property": "concept",
+ "property": "SCALE_TYP",
  "op": "is-a",
  "value": "STI"
  }