Merge 8054080 into ad7e7e3

inspirehep · Dec 7, 2018 · f99d662 · f99d662
2 parents ad7e7e3 + 8054080
commit f99d662
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 27 deletions.
diff --git a/inspire_query_parser/visitors/elastic_search_visitor.py b/inspire_query_parser/visitors/elastic_search_visitor.py
@@ -113,6 +113,7 @@ class ElasticSearchVisitor(Visitor):
         'title': 'titles.full_title',
         'type-code': 'document_type',
         'topcite': 'citation_count',
+        'affiliation': 'authors.affiliations.value',
     }
     """Mapping from keywords to ElasticSearch fields.
 
@@ -708,6 +709,10 @@ def visit_value(self, node, fieldnames=None):
                 elif ElasticSearchVisitor.KEYWORD_TO_ES_FIELDNAME['type-code'] == fieldnames:
                     return self._generate_type_code_query(node.value)
 
+                elif ElasticSearchVisitor.KEYWORD_TO_ES_FIELDNAME['affiliation'] == fieldnames:
+                    query = generate_match_query(ElasticSearchVisitor.KEYWORD_TO_ES_FIELDNAME['affiliation'], node.value, with_operator_and=True)
+                    return generate_nested_query(ElasticSearchVisitor.AUTHORS_NESTED_QUERY_PATH, query)
+
                 elif fieldnames not in ElasticSearchVisitor.KEYWORD_TO_ES_FIELDNAME.values():
                     colon_value = ':'.join([fieldnames, node.value])
                     given_field_query = generate_match_query(fieldnames, node.value, with_operator_and=True)

diff --git a/tests/test_elastic_search_visitor.py b/tests/test_elastic_search_visitor.py
@@ -2224,33 +2224,11 @@ def test_nested_author_fields_query():
             "nested": {
                 "path": "authors",
                 "query": {
-                    "bool": {
-                        "should": [
-                            {
-                                "match": {
-                                    "authors.affiliations.value": {
-                                        "operator": "and",
-                                        "query": "CERN"
-                                    }
-                                }
-                            },
-                            {
-                                "term": {
-                                    "texkeys.raw": {
-                                        "boost": 2.0,
-                                        "value": "authors.affiliations.value:CERN"
-                                    }
-                                }
-                            },
-                            {
-                                "match": {
-                                    "_all": {
-                                        "operator": "and",
-                                        "query": "authors.affiliations.value:CERN"
-                                    }
-                                }
-                            }
-                        ]
+                    "match": {
+                        "authors.affiliations.value": {
+                            "operator": "and",
+                            "query": "CERN"
+                        }
                     }
                 }
             }
@@ -2301,3 +2279,24 @@ def test_nested_publication_info_fields_query():
 
     generated_es_query = _parse_query(query_str)
     assert generated_es_query == expected_es_query
+
+
+def test_affiliation_query():
+    query_str = 'aff:CERN'
+    expected_es_query = \
+        {
+            "nested": {
+                "path": "authors",
+                "query": {
+                    "match": {
+                        "authors.affiliations.value": {
+                            "operator": "and",
+                            "query": "CERN"
+                        }
+                    }
+                }
+            }
+        }
+
+    generated_es_query = _parse_query(query_str)
+    assert generated_es_query == expected_es_query