Merge pull request #134 from MJedr/range-date-queries

visitor: support range queries in publication_info.year
inspirehep · May 26, 2020 · 1795ade · 1795ade
2 parents 51ccca1 + 95ebbdb
commit 1795ade
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/inspire_query_parser/config.py b/inspire_query_parser/config.py
@@ -159,8 +159,8 @@
     'vol': 'volume',
 
     # Journal year
-    'journal-year': 'journal-year',
-    'jy': 'journal-year',
+    'journal-year': 'publication_info.year',
+    'jy': 'publication_info.year',
 
     # Keyword
     # keyword is Invenio style, while the rest are from SPIRES syntax.

diff --git a/inspire_query_parser/visitors/elastic_search_visitor.py b/inspire_query_parser/visitors/elastic_search_visitor.py
@@ -513,14 +513,14 @@ def _generate_range_queries(self, fieldnames, operator_value_pairs):
                         if fieldname in self.DATE_NESTED_FIELDS
                         else range_query
                     )
+        elif 'publication_info.year' in fieldnames:
+            range_queries = [generate_nested_query(self.DATE_NESTED_QUERY_PATH,
+                                                   {'range': {fieldname: operator_value_pairs}})
+                             for fieldname in fieldnames]
+
         else:
-            range_queries = [{
-                'range': {
-                    fieldname: operator_value_pairs
-                }
-            }
-                for fieldname in fieldnames
-            ]
+            range_queries = [{'range': {fieldname: operator_value_pairs}}
+                             for fieldname in fieldnames]
 
         return wrap_queries_in_bool_clauses_if_more_than_one(range_queries, use_must_clause=False)
 

diff --git a/tests/test_elastic_search_visitor.py b/tests/test_elastic_search_visitor.py
@@ -3409,3 +3409,23 @@ def test_exact_match_query_for_names():
 
     generated_es_query = _parse_query(query_str)
     assert generated_es_query == expected_es_query
+
+
+def test_range_date_queries_are_nested():
+    query_str = 'jy:2015->2018'
+    expected_es_query = {
+       "nested": {
+          "path": "publication_info",
+          "query": {
+             "range": {
+                "publication_info.year": {
+                   "gte": "2015",
+                   "lte": "2018"
+                }
+             }
+          }
+       }
+    }
+
+    generated_es_query = _parse_query(query_str)
+    assert generated_es_query == expected_es_query