fix: Handle zero case for API usage limit (#4428)

Flagsmith · Jul 30, 2024 · 04e8bc2 · 04e8bc2
1 parent d4006c0
commit 04e8bc2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/api/organisations/models.py b/api/organisations/models.py
@@ -452,7 +452,7 @@ class OrganisationSubscriptionInformationCache(LifecycleModelMixin, models.Model
     api_calls_30d = models.IntegerField(default=0)
 
     allowed_seats = models.IntegerField(default=1)
-    allowed_30d_api_calls = models.IntegerField(default=50000)
+    allowed_30d_api_calls = models.IntegerField(default=MAX_API_CALLS_IN_FREE_PLAN)
     allowed_projects = models.IntegerField(default=1, blank=True, null=True)
 
     chargebee_email = models.EmailField(blank=True, max_length=254, null=True)

diff --git a/api/organisations/task_helpers.py b/api/organisations/task_helpers.py
@@ -13,6 +13,7 @@
     OrganisationAPIUsageNotification,
     OrganisationRole,
 )
+from organisations.subscriptions.constants import MAX_API_CALLS_IN_FREE_PLAN
 from users.models import FFAdminUser
 
 from .constants import API_USAGE_ALERT_THRESHOLDS
@@ -114,6 +115,9 @@ def handle_api_usage_notification_for_organisation(organisation: Organisation) -
 
     api_usage = get_current_api_usage(organisation.id, f"-{days}d")
 
+    # For some reason the allowed API calls is set to 0 so default to the max free plan.
+    allowed_api_calls = allowed_api_calls or MAX_API_CALLS_IN_FREE_PLAN
+
     api_usage_percent = int(100 * api_usage / allowed_api_calls)
 
     matched_threshold = None