Fixes bug when chaining expressions with OR

Author: developer992

pyodata/v2/service.py

@@ -1276,7 +1276,7 @@ def _combine_expressions(self, expressions):
             return combined
 
         return expressions[0]
-    
+
     # pylint: disable=too-many-return-statements, too-many-branches
     def _build_expression(self, field_name, operator, value):
         target_field = self.proprty_obj(field_name)

tests/test_service_v2.py

@@ -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)
 
@@ -2557,7 +2557,7 @@ def test_count_with_chainable_filter_multiple(service):
 def test_chaining_fix(service):
     from pyodata.v2.service import FilterExpression as Q
 
-    url = f"{service.url}/Employees?%24filter=startswith%28NameFirst%2C+%27Steve%27%29+eq+true+and+ID+eq+23+or+ID+eq+25+or+ID+eq+28"
+    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,
@@ -2581,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)
 
@@ -2600,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)