diff --git a/app/__init__.py b/app/__init__.py index e73da2046..ef46fdb87 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -287,8 +287,9 @@ def init_app(application): remaining_global_messages = 0 if current_app: + service_id = session.get("service_id") global_limit = current_app.config["GLOBAL_SERVICE_MESSAGE_LIMIT"] - global_messages_count = service_api_client.get_global_notification_count() + global_messages_count = service_api_client.get_global_notification_count(service_id) remaining_global_messages = global_limit - global_messages_count return {"daily_global_messages_remaining": remaining_global_messages} diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py index 3c29111df..25b9d7c6e 100644 --- a/app/notify_client/service_api_client.py +++ b/app/notify_client/service_api_client.py @@ -497,11 +497,8 @@ class ServiceAPIClient(NotifyAdminAPIClient): return int(count) - def get_global_notification_count(self): - # if cache is not set, or not enabled, return 0 - count = redis_client.get(daily_total_cache_key()) or 0 - - return int(count) + def get_global_notification_count(self, service_id): + return self.get("/service/{}/notification-count".format(service_id)) service_api_client = ServiceAPIClient()