Gate remaining get_current_api_usage calls

Author: emyller

api/organisations/tasks.py

@@ -12,6 +12,7 @@
     register_task_handler,
 )
 
+from app_analytics.analytics_db_service import get_total_events_count
 from app_analytics.influxdb_wrapper import get_current_api_usage
 from integrations.flagsmith.client import get_client
 from organisations import subscription_info_cache
@@ -214,10 +215,18 @@ def charge_for_api_call_count_overages():  # type: ignore[no-untyped-def]
             continue
 
         subscription_cache = organisation.subscription_information_cache
-        api_usage = get_current_api_usage(
-            organisation_id=organisation.id,
-            date_start=subscription_cache.current_billing_term_starts_at,
-        )
+        if flags.is_feature_enabled(
+            "get_current_api_usage_deprecated"
+        ):  # pragma: no cover
+            api_usage = get_total_events_count(
+                organisation,
+                date_start=subscription_cache.current_billing_term_starts_at,
+            )
+        else:
+            api_usage = get_current_api_usage(
+                organisation_id=organisation.id,
+                date_start=subscription_cache.current_billing_term_starts_at,
+            )
 
         # Grace period for organisations < 200% of usage.
         if (
@@ -347,10 +356,18 @@ def restrict_use_due_to_api_limit_grace_period_over() -> None:
         OrganisationBreachedGracePeriod.objects.get_or_create(organisation=organisation)
 
         subscription_cache = organisation.subscription_information_cache
-        api_usage = get_current_api_usage(
-            organisation_id=organisation.id,
-            date_start=now - timedelta(days=30),
-        )
+        if flags.is_feature_enabled(
+            "get_current_api_usage_deprecated"
+        ):  # pragma: no cover
+            api_usage = get_total_events_count(
+                organisation,
+                date_start=now - timedelta(days=30),
+            )
+        else:
+            api_usage = get_current_api_usage(
+                organisation_id=organisation.id,
+                date_start=now - timedelta(days=30),
+            )
         if api_usage / subscription_cache.allowed_30d_api_calls < 1.0:
             logger.info(
                 f"API use for organisation {organisation.id} has fallen to below limit, so not restricting use."