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

Bugfix when chaining expressions using OR #283

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix when chaining expressions using OR #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pyodata/v2/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,14 @@ def _decode_expression(self, expr, val):

# pylint: disable=no-self-use
def _combine_expressions(self, expressions):
return ' and '.join(expressions)
if len(expressions) > 1:
combined = ""
for counter, expr in enumerate(expressions):
combined += f"{' and ' if counter > 0 else ''}({expr})"

return combined

return expressions[0]

# pylint: disable=too-many-return-statements, too-many-branches
def _build_expression(self, field_name, operator, value):
Expand Down
26 changes: 23 additions & 3 deletions tests/test_service_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2541,7 +2541,7 @@ def test_count_with_chainable_filter_multiple(service):

responses.add(
responses.GET,
f"{service.url}/Employees/$count?%24filter=ID%20eq%2023%20and%20NickName%20eq%20%27Steve%27",
f"{service.url}/Employees/$count?%24filter=%28ID%20eq%2023%29%20and%20%28NickName%20eq%20%27Steve%27%29",
json=3,
status=200)

Expand All @@ -2553,6 +2553,26 @@ def test_count_with_chainable_filter_multiple(service):
assert request.execute() == 3


@responses.activate
def test_chaining_fix(service):
from pyodata.v2.service import FilterExpression as Q

url = f"{service.url}/Employees?%24filter=%28startswith%28NameFirst%2C+%27Steve%27%29+eq+true%29+and+%28ID+eq+23+or+ID+eq+25+or+ID+eq+28%29"

responses.add(
responses.GET,
url,
json=3,
status=200)

employees = service.entity_sets.Employees.get_entities()
request = employees.filter(Q(NameFirst__startswith="Steve"), Q(ID__in=[23, 25, 28]))

assert isinstance(request, pyodata.v2.service.GetEntitySetRequest)

assert request.execute() == 3


@responses.activate
def test_count_with_chainable_filter_or(service):
"""Check getting $count with $filter with FilterExpression syntax or"""
Expand All @@ -2561,7 +2581,7 @@ def test_count_with_chainable_filter_or(service):

responses.add(
responses.GET,
f"{service.url}/Employees/$count?$filter=%28ID%20eq%2023%20and%20NickName%20eq%20%27Steve%27%29%20or%20%28ID%20eq%2025%20and%20NickName%20eq%20%27Tim%27%29",
f"{service.url}/Employees/$count?$filter=%28%28ID%20eq%2023%29%20and%20%28NickName%20eq%20%27Steve%27%29%29%20or%20%28%28ID%20eq%2025%29%20and%20%28NickName%20eq%20%27Tim%27%29%29",
json=3,
status=200)

Expand All @@ -2580,7 +2600,7 @@ def test_count_with_multiple_chainable_filters_startswith(service):

responses.add(
responses.GET,
f"{service.url}/Employees/$count?$filter=%28ID%20eq%2023%20and%20startswith%28NickName%2C%20%27Ste%27%29%20eq%20true%29%20or%20%28ID%20eq%2025%20and%20NickName%20eq%20%27Tim%27%29",
f"{service.url}/Employees/$count?$filter=%28%28ID%20eq%2023%29%20and%20%28startswith%28NickName%2C%20%27Ste%27%29%20eq%20true%29%29%20or%20%28%28ID%20eq%2025%29%20and%20%28NickName%20eq%20%27Tim%27%29%29",
json=3,
status=200)

Expand Down
Loading