darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 19:28:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add notif count and history count together

Browse Source
This commit is contained in:
Andrew Shumway
2023-10-17 11:11:17 -06:00
committed by Carlo Costino
parent 2fbda1cd0c
commit 81f4b1436d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/__init__.py
View File

@@ -285,12 +285,13 @@ def init_app(application):
@application.context_processor @application.context_processor
def _attach_current_global_daily_messages(): def _attach_current_global_daily_messages():
remaining_global_messages = 0 remaining_global_messages = 0
if current_app: if current_app:
service_id = session.get("service_id") 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(service_id) if service_id:
remaining_global_messages = global_limit - global_messages_count global_limit = current_app.config["GLOBAL_SERVICE_MESSAGE_LIMIT"]
global_messages_count = service_api_client.get_global_notification_count(service_id)
remaining_global_messages = global_limit - global_messages_count.get("count")
return {"daily_global_messages_remaining": remaining_global_messages} return {"daily_global_messages_remaining": remaining_global_messages}
@application.before_request @application.before_request

2
app/notify_client/service_api_client.py
View File

@@ -498,7 +498,7 @@ class ServiceAPIClient(NotifyAdminAPIClient):
return int(count) return int(count)
def get_global_notification_count(self, service_id): def get_global_notification_count(self, service_id):
return self.get("/service/{}/notification-count".format(service_id)) return self.get("/service/{}/notification-count".format(service_id))
service_api_client = ServiceAPIClient() service_api_client = ServiceAPIClient()