Skip to content

Add year interval for DateHistogramFacet #1502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 13, 2021
Merged

Add year interval for DateHistogramFacet #1502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8232bb0
Add year interval for DateHistogramFacet
nrsimha May 2, 2021
767d6d3
Change day from 29 Feb to 28 for year interval.
nrsimha Jul 8, 2021
4554f02
Merge branch 'master' into feature-1501-add-year-interval
nrsimha Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions elasticsearch_dsl/faceted_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ def get_value_filter(self, filter_value):
)


def _date_interval_year(d):
return (d + timedelta(days=366)).replace(day=1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's change this to return d.replace(year=d.year+1, day=(28 if d.month == 2 and d.day == 29 else d.day)) since years are linear unlike months.

We should add a test case for leap day handling as well (Basically see that February 29th, 2020 increments to February 28th, 2021)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Updated to 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)

Expand All @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions tests/test_faceted_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down