darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-04 05:20:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Requested changes in PR review

Browse Source
This commit is contained in:
Andrew Shumway
2023-06-01 15:40:50 -06:00
parent c97b412afe
commit a1484c62bb
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/__init__.py
View File

@@ -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)

2
app/main/views/send.py
View File

@@ -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)

2
app/notify_client/service_api_client.py
View File

@@ -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)