From a1484c62bba1f266f9e7f10a20c135b638d2ee4b Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Thu, 1 Jun 2023 15:40:50 -0600 Subject: [PATCH] Requested changes in PR review --- app/__init__.py | 2 +- app/main/views/send.py | 2 +- app/notify_client/service_api_client.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index c108d6a8c..a8cc7e930 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -315,7 +315,7 @@ def init_app(application): def _attach_current_daily_remaining_messages_per_service(): remaining_messages = 0 - if hasattr(current_service, 'message_limit'): + if current_service: remaining_messages = current_service.message_limit - service_api_client.get_notification_count( service_id=current_service.id) diff --git a/app/main/views/send.py b/app/main/views/send.py index 53e8eaa9d..b96479d58 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -81,7 +81,7 @@ def get_example_csv_rows(template, use_example_as_example=True, submitted_fields @user_has_permissions('send_messages', restrict_admin_usage=True) def send_messages(service_id, template_id): notification_count = service_api_client.get_notification_count(service_id) - remaining_messages = (current_service.message_limit - notification_count) + remaining_messages = current_service.message_limit - notification_count db_template = current_service.get_template_with_user_permission_or_403(template_id, current_user) diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py index 4e7488246..8c55d5157 100644 --- a/app/notify_client/service_api_client.py +++ b/app/notify_client/service_api_client.py @@ -530,14 +530,12 @@ class ServiceAPIClient(NotifyAdminAPIClient): def get_notification_count(self, service_id): # if cache is not set, or not enabled, return 0 - count = redis_client.get(daily_limit_cache_key(service_id)) or 0 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)