Add year interval for DateHistogramFacet

elastic · Jul 13, 2021 · 1ac597f · 1ac597f
1 parent 7cc4484
commit 1ac597f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/elasticsearch_dsl/faceted_search.py b/elasticsearch_dsl/faceted_search.py
@@ -168,6 +168,10 @@ def get_value_filter(self, filter_value):
         )
 
 
+def _date_interval_year(d):
+    return d.replace(year=d.year+1, day=(28 if d.month == 2 and d.day == 29 else d.day))
+
+
 def _date_interval_month(d):
     return (d + timedelta(days=32)).replace(day=1)
 
@@ -188,6 +192,8 @@ class DateHistogramFacet(Facet):
     agg_type = "date_histogram"
 
     DATE_INTERVALS = {
+        "year": _date_interval_year,
+        "1Y": _date_interval_year,
         "month": _date_interval_month,
         "1M": _date_interval_month,
         "week": _date_interval_week,

diff --git a/tests/test_faceted_search.py b/tests/test_faceted_search.py
@@ -151,6 +151,8 @@ def test_date_histogram_facet_with_1970_01_01_date():
 @pytest.mark.parametrize(
     ["interval_type", "interval"],
     [
+        ("interval", "year"),
+        ("calendar_interval", "year"),
         ("interval", "month"),
         ("calendar_interval", "month"),
         ("interval", "week"),
@@ -160,6 +162,8 @@ def test_date_histogram_facet_with_1970_01_01_date():
         ("fixed_interval", "day"),
         ("interval", "hour"),
         ("fixed_interval", "hour"),
+        ("interval", "1Y"),
+        ("calendar_interval", "1Y"),
         ("interval", "1M"),
         ("calendar_interval", "1M"),
         ("interval", "1w"),