Skip to content

Validate minimum_limit #7981

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

Open
pieterbeulque wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Validate minimum_limit #7981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions server/polar/event/endpoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion server/polar/kit/time_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
4 changes: 2 additions & 2 deletions server/polar/meter/endpoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions server/polar/metrics/endpoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading