From a233b4861fb77ba58e666050bafa71f456ff5aa1 Mon Sep 17 00:00:00 2001 From: Matthew Elwell Date: Thu, 30 Jan 2025 15:31:11 +0000 Subject: [PATCH] Use relative delta and months, instead of days --- api/organisations/tasks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/organisations/tasks.py b/api/organisations/tasks.py index 25efa8911804..7ce6828cedf6 100644 --- a/api/organisations/tasks.py +++ b/api/organisations/tasks.py @@ -3,6 +3,7 @@ from datetime import timedelta from app_analytics.influxdb_wrapper import get_current_api_usage +from dateutil.relativedelta import relativedelta from django.conf import settings from django.core.mail import send_mail from django.db.models import F, Max, Q @@ -154,7 +155,7 @@ def charge_for_api_call_count_overages(): # Get the period where we're interested in any new API usage # notifications for the relevant billing period (ie, this month). - api_usage_notified_at = now - timedelta(days=30) + api_usage_notified_at = now - relativedelta(months=1) # Since we're only interested in monthly billed accounts, set a wide # threshold to catch as many billing periods that could be roughly @@ -210,7 +211,7 @@ def charge_for_api_call_count_overages(): continue subscription_cache = organisation.subscription_information_cache - api_usage = get_current_api_usage(organisation.id) + api_usage = get_current_api_usage(7201) # Grace period for organisations < 200% of usage. if (