Merge pull request #60 from mdhaman/aggregations

If req.args is not specified then aggregations is false
superdesk · Apr 13, 2016 · bb5f50a · bb5f50a
2 parents 2732d87 + 4eb8f87
commit bb5f50a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/eve_elastic/elastic.py b/eve_elastic/elastic.py
@@ -355,7 +355,8 @@ def find(self, resource, req, sub_resource_lookup):
         return self._parse_hits(hits, resource)
 
     def should_aggregate(self, req):
-        return current_app.config.get('ELASTICSEARCH_AUTO_AGGREGATIONS') or req.args.get('aggregations')
+        return current_app.config.get('ELASTICSEARCH_AUTO_AGGREGATIONS') or \
+            (req.args and req.args.get('aggregations'))
 
     def find_one(self, resource, req, **lookup):
 

diff --git a/test/test_elastic.py b/test/test_elastic.py
@@ -374,6 +374,13 @@ def test_filters_with_aggregations(self):
             self.assertIn({'key': 'test', 'doc_count': 1}, res['_aggregations']['type']['buckets'])
             self.assertEqual(1, res['_aggregations']['type']['buckets'][0]['doc_count'],)
 
+    def test_filter_without_args(self):
+        with self.app.app_context():
+            self.app.data.insert('items', [{'uri': 'foo'}, {'uri': 'bar'}])
+            req = ParsedRequest()
+            self.assertEqual(2, self.app.data.find('items', req, None).count())
+            self.assertEqual(1, self.app.data.find('items', req, {'uri': 'foo'}).count())
+
     def test_filters_with_filtered_query(self):
         with self.app.app_context():
             self.app.data.insert('items', [