Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always apply vs filters correctly #2195

Merged
merged 6 commits into from Nov 24, 2020
Merged

Always apply vs filters correctly #2195

merged 6 commits into from Nov 24, 2020

Conversation

jamesagnew
Copy link
Collaborator

No description provided.

tadgh
tadgh approved these changes Nov 24, 2020
View reviewed changes
Copy link
Collaborator

@tadgh tadgh 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, approved.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Nov 24, 2020

Codecov Report

Merging #2195 (3b12f4f) into master (a01f5ae) will decrease coverage by 0.01%.
The diff coverage is 83.45%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2195      +/-   ##
============================================
- Coverage     81.43%   81.42%   -0.02%     
+ Complexity    17081    17027      -54     
============================================
  Files          1167     1167              
  Lines         62908    62710     -198     
  Branches       9840     9803      -37     
============================================
- Hits          51229    51060     -169     
+ Misses         7832     7828       -4     
+ Partials       3847     3822      -25
Impacted Files Coverage Δ Complexity Δ
...ueSetExpansionComponentWithConceptAccumulator.java 78.40% <0.00%> (-4.15%) 26.00 <0.00> (-2.00)
...java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java 89.00% <76.40%> (+0.20%) 413.00 <20.00> (+2.00)
...fhir/context/support/ValueSetExpansionOptions.java 88.88% <100.00%> (+2.22%) 8.00 <1.00> (+1.00)
...ir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java 90.32% <100.00%> (+9.37%) 13.00 <6.00> (-19.00) ⬆️
.../fhir/jpa/dao/predicate/PredicateBuilderToken.java 61.71% <100.00%> (ø) 40.00 <0.00> (ø)
...uhn/fhir/jpa/dao/r4/FhirResourceDaoValueSetR4.java 80.76% <100.00%> (+1.38%) 13.00 <4.00> (-16.00) ⬆️
...uhn/fhir/jpa/dao/r5/FhirResourceDaoValueSetR5.java 96.29% <100.00%> (+14.57%) 12.00 <4.00> (-15.00) ⬆️
...earch/builder/predicate/TokenPredicateBuilder.java 87.76% <100.00%> (ø) 41.00 <0.00> (ø)
...ain/java/ca/uhn/fhir/jpa/term/ExpansionFilter.java 82.75% <100.00%> (+7.75%) 10.00 <2.00> (+2.00)
.../main/java/ca/uhn/fhir/jpa/term/TermReadSvcR4.java 69.56% <0.00%> (-8.70%) 13.00% <0.00%> (-1.00%)
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 99d2bf1...3b12f4f. Read the comment docs.

@jamesagnew jamesagnew merged commit fb8658d into master Nov 24, 2020
@jamesagnew jamesagnew deleted the ja_20201124_always_apply_vs_filters_correctly branch November 24, 2020 23:12
@dmuylwyk dmuylwyk linked an issue Nov 26, 2020 that may be closed by this pull request
bug with ValueSet$expand with filter #2189
Closed
HananAwwad pushed a commit to HananAwwad/hapi-fhir that referenced this pull request Jan 6, 2021
@jamesagnew @HananAwwad
Always apply vs filters correctly (hapifhir#2195)
8363c99 
* Always apply valueset filters correctly

* Test fix

* Testfix

* Test fix

* Add changelog

* Test fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tadgh tadgh tadgh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bug with ValueSet$expand with filter
2 participants
@jamesagnew @tadgh