articles: search - add country aggregation

Signed-off-by: pamfilos <[email protected]>
SCOAP3 · Oct 19, 2023 · 375bb3a · 375bb3a
1 parent 23157d6
commit 375bb3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scoap3/articles/api/views.py b/scoap3/articles/api/views.py
@@ -88,6 +88,7 @@ class ArticleDocumentView(BaseDocumentViewSet):
                 LOOKUP_QUERY_IN,
             ],
         },
+        "country": "authors.affiliations.country.name"
     }
 
     faceted_search_fields = {
@@ -104,6 +105,11 @@ class ArticleDocumentView(BaseDocumentViewSet):
             "facet": TermsFacet,
             "enabled": True,
         },
+        "country": {
+            "field": "authors.affiliations.country.name",
+            "facet": TermsFacet,
+            "enabled": True,
+        },
     }
 
     def get_serializer_class(self):

diff --git a/scoap3/articles/documents.py b/scoap3/articles/documents.py
@@ -62,15 +62,15 @@ class ArticleDocument(Document):
         }
     )
 
-    authors = fields.NestedField(
+    authors = fields.ObjectField(
         properties={
             "first_name": fields.TextField(),
             "last_name": fields.TextField(),
-            "affiliations": fields.NestedField(
+            "affiliations": fields.ObjectField(
                 properties={
                     "value": fields.TextField(),
                     "organization": fields.TextField(),
-                    "country": fields.NestedField(
+                    "country": fields.ObjectField(
                         properties={
                             "code": fields.TextField(),
                             "name": fields.KeywordField(),