Support Is-a filter in local ValueSet expansion #2733
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ewoutkramer
requested changes
Mar 13, 2024
src/Hl7.Fhir.Shims.Base/Specification/Terminology/CodeSystemFilterProcessor.cs
Outdated
Show resolved
Hide resolved
src/Hl7.Fhir.Shims.Base/Specification/Terminology/CodeSystemFilterProcessor.cs
Show resolved
Hide resolved
src/Hl7.Fhir.Shims.Base/Specification/Terminology/CodeSystemFilterProcessor.cs
Outdated
Show resolved
Hide resolved
| //find all properties that are parents. | ||
| var parents = concept.Property | ||
| .Where(p => p.Code == SUBSUMEDBYCODE && p.Value is Code && ((Code)p.Value).Value is not null) | ||
| .Select(p => ((Code)p.Value).Value); |
There was a problem hiding this comment.
You can do most of the code in this function with the LINQ GroupBy function, which returns an ILookup, just what you need here, and probably more efficient.
| } | ||
| } | ||
|
|
||
| if (concept.Concept is not null && concept.Concept.Any()) |
There was a problem hiding this comment.
There are multiple places in the code where we need the whole list of the code + its children. Maybe you can make a function "Flatten" that returns an enumerable (with our without the parent itself, I don't know whats best). Then you can write both the filtering and the grouping stuff in this function using that Flatten.
|
I pushed a commit showing what I meant with some changes to the code filter extensions. Don't pull them if you want to try it our yourself first ;-) |
alexzautke
reviewed
Mar 15, 2024
src/Hl7.Fhir.Shims.Base/Specification/Terminology/CodeSystemFilterProcessor.cs
Outdated
Show resolved
Hide resolved
ewoutkramer
approved these changes
Mar 19, 2024
| var codeSystem = await settings.ValueSetSource.AsAsync().FindCodeSystemAsync(codeSystemUri).ConfigureAwait(false) | ||
| ?? throw new CodeSystemUnknownException($"Cannot find codesystem '{codeSystemUri}', so the defined filter(s) cannot be applied."); | ||
|
|
||
| if (codeSystem.Content.GetLiteral() != "complete") |
There was a problem hiding this comment.
Suggested change
| if (codeSystem.Content.GetLiteral() != "complete") | |
| if (codeSystem.Content != CodeSystemContentMode.Complete) |
mmsmits
deleted the
2727-support-is-a-filter-in-local-valueset-expansion
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #2727 #2728