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.

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

Improve nested filtering. #800

Merged
merged 2 commits into from
Jun 5, 2020
Merged

Conversation

michael-simons
Copy link
Collaborator

This change allows having OR’s in nested filters targeting the same entity. Thus, the entity itself works as a logical group and can itself by combined with filters on other properties with AND.

A combination of filters with OR containing one nested filter is still not allowed.

This commit makes the NodeQueryBuilder collapse deeply nested filters the same way as it does with normal ones.

This change allows having OR’s in nested filters targeting the same entity. Thus, the entity itself works as a logical group and can itself by combined with filters on other properties with AND.

A combination of filters with OR containing one nested filter is still not allowed.

This commit makes the `NodeQueryBuilder` collapse deeply nested filters the same way as it does with normal ones.
@codecov-commenter
Copy link

codecov-commenter commented Jun 5, 2020

Codecov Report

Merging #800 into master will increase coverage by 0.06%.
The diff coverage is 95.34%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #800      +/-   ##
============================================
+ Coverage     80.41%   80.48%   +0.06%     
- Complexity     3039     3043       +4     
============================================
  Files           277      277              
  Lines          9253     9273      +20     
  Branches       1381     1386       +5     
============================================
+ Hits           7441     7463      +22     
+ Misses         1303     1302       -1     
+ Partials        509      508       -1     
Impacted Files Coverage Δ Complexity Δ
...rg/neo4j/ogm/session/request/NodeQueryBuilder.java 94.93% <87.50%> (+1.34%) 24.00 <3.00> (+2.00)
...eo4j/ogm/session/request/FilteredQueryBuilder.java 94.05% <100.00%> (+1.37%) 29.00 <10.00> (+1.00)
...session/request/NestedPropertyPathMatchClause.java 87.50% <0.00%> (+6.25%) 8.00% <0.00%> (+1.00%)

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 0950de5...38e5297. Read the comment docs.

@michael-simons michael-simons merged commit 47d6b05 into master Jun 5, 2020
@michael-simons michael-simons deleted the feature/improve_nested_or branch June 5, 2020 14:37
michael-simons added a commit that referenced this pull request Jun 5, 2020
This change allows having OR’s in nested filters targeting the same entity. Thus, the entity itself works as a logical group and can itself by combined with filters on other properties with AND.

A combination of filters with OR containing one nested filter is still not allowed.

This commit makes the `NodeQueryBuilder` collapse deeply nested filters the same way as it does with normal ones.
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.

None yet

3 participants