diff --git a/server/polar/event/endpoints.py b/server/polar/event/endpoints.py index 9f6b6b1d7b..05c31b3884 100644 --- a/server/polar/event/endpoints.py +++ b/server/polar/event/endpoints.py @@ -234,8 +234,8 @@ async def list_statistics_timeseries( { "loc": ("query",), "msg": ( - "The interval is too big. " - "Try to change the interval or reduce the date range." + "The interval does not match the date range. " + "Try to change the interval or adjust the date range." ), "type": "value_error", "input": (start_date, end_date, interval), diff --git a/server/polar/kit/time_queries.py b/server/polar/kit/time_queries.py index 3bd398468a..25bf5e7a3e 100644 --- a/server/polar/kit/time_queries.py +++ b/server/polar/kit/time_queries.py @@ -62,4 +62,5 @@ def get_timestamp_series_cte( def is_under_limits(start_date: date, end_date: date, interval: TimeInterval) -> bool: - return end_date.toordinal() - start_date.toordinal() <= MAX_INTERVAL_DAYS[interval] + days = end_date.toordinal() - start_date.toordinal() + return days >= MIN_INTERVAL_DAYS[interval] and days <= MAX_INTERVAL_DAYS[interval] diff --git a/server/polar/meter/endpoints.py b/server/polar/meter/endpoints.py index edfde6c755..b800896216 100644 --- a/server/polar/meter/endpoints.py +++ b/server/polar/meter/endpoints.py @@ -138,8 +138,8 @@ async def quantities( { "loc": ("query",), "msg": ( - "The interval is too big. " - "Try to change the interval or reduce the date range." + "The interval does not match the date range. " + "Try to change the interval or adjust the date range." ), "type": "value_error", "input": (start_timestamp, end_timestamp, interval), diff --git a/server/polar/metrics/endpoints.py b/server/polar/metrics/endpoints.py index 730b04c2ed..61e2e90b02 100644 --- a/server/polar/metrics/endpoints.py +++ b/server/polar/metrics/endpoints.py @@ -73,8 +73,8 @@ async def get( { "loc": ("query",), "msg": ( - "The interval is too big. " - "Try to change the interval or reduce the date range." + "The interval does not match the date range. " + "Try to change the interval or adjust the date range." ), "type": "value_error", "input": (start_date, end_date, interval),