more on global aggregations

Author: barseghyanartur

README.rst

@@ -72,6 +72,7 @@ Main features and highlights
 - :doc:`Multi match search filter backend <search_backends>`.
 - :doc:`Simple search query search filter backend <search_backends>`.
 - :doc:`More-like-this support (detail action) <more_like_this>`.
+- :doc:`Global aggregations support <global_aggregations>`.
 
 Installation
 ============

examples/simple/search_indexes/viewsets/book/base.py

@@ -190,7 +190,7 @@ class BaseBookDocumentViewSet(BaseDocumentViewSet):
         'publisher': {
             'field': 'publisher.raw',
             'enabled': True,
-            'type': 'global',
+            'global': True,
         },
         'publication_date': {
             'field': 'publication_date',

global_aggregations.rst

@@ -0,0 +1,55 @@
+Global aggregations
+===================
+Global aggregations.
+
+Sample view
+-----------
+
+.. code-block:: python
+
+    from django_elasticsearch_dsl_drf.filter_backends import (
+        CompoundSearchFilterBackend,
+        DefaultOrderingFilterBackend,
+        FacetedSearchFilterBackend,
+        OrderingFilterBackend,
+    )
+    from django_elasticsearch_dsl_drf.viewsets import DocumentViewSet
+
+    from .documents import BookDocument
+    from .serializers import BookDocumentSerializer
+
+    class BookCompoundSearchBackendDocumentViewSet(DocumentViewSet):
+
+        document = BookDocument
+        serializer_class = BookDocumentSerializer
+        lookup_field = 'id'
+
+        filter_backends = [
+            # ...
+            OrderingFilterBackend,
+            DefaultOrderingFilterBackend,
+            CompoundSearchFilterBackend,
+            FacetedSearchFilterBackend,
+            # ...
+        ]
+
+        faceted_search_fields = {
+            'publisher': {
+                'field': 'publisher.raw',
+                'enabled': True,
+                'global': True,  # This makes the aggregation global
+            },
+        }
+
+Sample request
+--------------
+
+.. code-block:: text
+
+    http://localhost:8000/search/books/?publisher=Egmont
+
+Sample response
+---------------
+
+.. code-block:: javascript
+

src/django_elasticsearch_dsl_drf/filter_backends/faceted_search.py

@@ -114,8 +114,8 @@ def prepare_faceted_search_fields(cls, view):
             if 'options' not in faceted_search_fields[field]:
                 faceted_search_fields[field]['options'] = {}
 
-            if 'type' not in faceted_search_fields[field]:
-                faceted_search_fields[field]['type'] = 'filter'
+            faceted_search_fields[field]['global'] = \
+                faceted_search_fields[field].get('global', False)
 
         return faceted_search_fields
 
@@ -175,7 +175,7 @@ def construct_facets(self, request, view):
                                 field=faceted_search_fields[__field]['field'],
                                 **faceted_search_fields[__field]['options']
                             ),
-                            'type': faceted_search_fields[__field]['type'],
+                            'global': faceted_search_fields[__field]['global'],
                         }
                     }
                 )
@@ -200,15 +200,15 @@ def aggregate(self, request, queryset, view):
             #         continue
             #     agg_filter &= __filter
 
-            if __facet['type'] == 'global':
+            if __facet['global']:
                 queryset.aggs.bucket(
                     '_filter_' + __field,
-                    __facet['type']
+                    'global'
                 ).bucket(__field, agg)
             else:
                 queryset.aggs.bucket(
                     '_filter_' + __field,
-                    __facet['type'],
+                    'filter',
                     filter=agg_filter
                 ).bucket(__field, agg)