Skip to content

Enhance local expansion of hybrid definitions#1008

Merged
sliver007 merged 14 commits into
mainfrom
fix_expansion_of_hybrid_definitions
Apr 30, 2026
Merged

Enhance local expansion of hybrid definitions#1008
sliver007 merged 14 commits into
mainfrom
fix_expansion_of_hybrid_definitions

Conversation

@sliver007
Copy link
Copy Markdown
Collaborator

No description provided.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 23, 2026

Formatting check succeeded!

@sliver007 sliver007 marked this pull request as ready for review April 24, 2026 15:52
Copy link
Copy Markdown
Contributor

@c-schuler c-schuler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks mostly good. Note the possible issues I commented.

I would suggest adding some additional testing for those issues:

  1. test for the filter + explicit-concept or filter + valueSet-reference case, which would likely currently pass with incorrect results.
  2. test for a compose with exclude + explicit concepts, which would likely also pass with incorrect results
  3. test confirming the fallback $expand path still preserves version

Comment thread cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/visitor/ExpandHelper.java Outdated
Comment thread cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/visitor/ExpandHelper.java Outdated
@sliver007 sliver007 requested a review from c-schuler April 29, 2026 16:52
Copy link
Copy Markdown
Contributor

@c-schuler c-schuler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good pending test fixes. One nit is that ExpandHelper.groupExpand() is no longer used - dead code.

Nice work!

@sliver007 sliver007 changed the title Fix expansion of hybrid definitions Enhance local expansion of hybrid definitions Apr 29, 2026
@sonarqubecloud
Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
72.9% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

@sliver007 sliver007 merged commit c7896f2 into main Apr 30, 2026
8 of 9 checks passed
@sliver007 sliver007 deleted the fix_expansion_of_hybrid_definitions branch April 30, 2026 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants