Merge pull request #49 from Kinto/45-take-query-size-into-account

Fix the number of results when specified in query (ref #45)

CHANGELOG.rst

@@ -5,7 +5,9 @@ Changelog
 0.3.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+**Bug fixes**
+
+- Fix the number of results when specified in query (ref #45)
 
 
 0.2.0 (2017-06-13)

kinto_elasticsearch/views.py

@@ -1,3 +1,4 @@
+import json
 import logging
 
 import elasticsearch
@@ -34,7 +35,17 @@ def search_view(request, **kwargs):
     max_fetch_size = request.registry.settings["storage_max_fetch_size"]
     if paginate_by is None or paginate_by <= 0:
         paginate_by = max_fetch_size
-    kwargs.setdefault("size", min(paginate_by, max_fetch_size))
+    configured = min(paginate_by, max_fetch_size)
+    # If the size is specified in query, ignore it if larger than setting.
+    specified = None
+    if "body" in kwargs:
+        try:
+            body = json.loads(kwargs["body"].decode("utf-8"))
+            specified = body.get("size")
+        except json.decoder.JSONDecodeError:
+            pass
+    if specified is None or specified > configured:
+        kwargs.setdefault("size", configured)
 
     # Access indexer from views using registry.
     indexer = request.registry.indexer

tests/test_elasticsearch.py

@@ -233,6 +233,28 @@ def test_the_number_of_responses_is_limited_by_only_defined_limit(self):
         result = resp.json
         assert len(result["hits"]["hits"]) == 2
 
+    def test_size_specified_in_query_is_taken_into_account(self):
+        app = self.get_app({"paginate_by": 3})
+        query = {
+            "from": 0, "size" : 2,
+            "query": {"match_all": {}}
+        }
+        resp = app.post_json("/buckets/bid/collections/cid/search", query,
+                             headers=self.headers)
+        result = resp.json
+        assert len(result["hits"]["hits"]) == 2
+
+    def test_size_specified_in_query_is_caped_by_setting(self):
+        app = self.get_app({"paginate_by": 3})
+        query = {
+            "size" : 4,
+            "query": {"match_all": {}}
+        }
+        resp = app.post_json("/buckets/bid/collections/cid/search", query,
+                             headers=self.headers)
+        result = resp.json
+        assert len(result["hits"]["hits"]) == 3
+
 
 class PermissionsCheck(BaseWebTest, unittest.TestCase):
     def test_search_is_allowed_if_write_on_bucket(self):