Allow multiple QueryFilters with the same prefix to be added to the post body (#21)

AetherUnbound · labkey-alan · commit 9cea289382e4 · 2019-05-02T16:08:01.000-07:00
* Add IntelliJ project artifact to gitignore

* Always add QueryFilters as a list to post body

This prevents potentially conflicting keys from overriding each other
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ build/
 dist/
 
 # Project Artifacts
-.idea/
+.idea/
+*.iml
diff --git a/labkey/query.py b/labkey/query.py
@@ -220,7 +220,11 @@ def select_rows(server_context, schema_name, query_name, view_name=None,
     if filter_array is not None:
         for query_filter in filter_array:
             prefix = query_filter.get_url_parameter_name()
-            payload[prefix] = query_filter.get_url_parameter_value()
+            # Use a list for each prefix, as a prefix may have multiple different
+            # filter values associated for it.
+            filters = payload.get(prefix, [])
+            filters.append(query_filter.get_url_parameter_value())
+            payload[prefix] = filters
 
     if columns is not None:
         payload['query.columns'] = columns
diff --git a/test/test_query_api.py b/test/test_query_api.py
@@ -22,7 +22,7 @@
     import unittest.mock as mock
 
 from labkey import utils
-from labkey.query import delete_rows, update_rows, insert_rows, select_rows, execute_sql
+from labkey.query import delete_rows, update_rows, insert_rows, select_rows, execute_sql, QueryFilter
 from labkey.exceptions import RequestError, QueryNotFoundError, ServerNotFoundError, RequestAuthorizationError
 
 from utilities import MockLabKey, mock_server_context, success_test, throws_error_test
@@ -245,6 +245,30 @@ def test_success(self):
         test = self
         success_test(test, self.service.get_successful_response(), select_rows, True, *self.args, **self.expected_kwargs)
 
+    def test_query_filter(self):
+        test = self
+        # Construct a set of arguments that
+        args = [
+            *self.args,
+            # view_name
+            None,
+            # filter_array
+            [
+                QueryFilter('Field1', 'value', 'eq'),
+                QueryFilter('Field2', 'value1', 'contains'),
+                QueryFilter('Field2', 'value2', 'contains'),
+            ]
+        ]
+        # Expected query field values in post request body
+        query_field = {
+            'query.Field1~eq': ['value'],
+            'query.Field2~contains': ['value1', 'value2'],
+        }
+        # Update post request body with expected query field values
+        self.expected_kwargs['data'].update(query_field)
+
+        success_test(test, self.service.get_successful_response(), select_rows, True, *args, **self.expected_kwargs)
+
     def test_unauthorized(self):
         test = self
         throws_error_test(test, RequestAuthorizationError, self.service.get_unauthorized_response(),

-Original file line number
+Diff line change
 dist/
 # Project Artifacts
 -.idea/
 +.idea/
 +*.iml