From 32dca0f5e0ad59825694ca275e2826686e85e31c Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Mon, 23 Oct 2023 10:24:00 -0600 Subject: [PATCH] Add notification history and notification to count --- app/dao/notifications_dao.py | 7 ++++--- app/service/rest.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 95167fff2..5d9dc2e33 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -191,9 +191,10 @@ def dao_get_notification_count_for_job_id(*, job_id): def dao_get_notification_count_for_service(*, service_id): - count = Notification.query.filter_by(service_id=service_id).count() - print(count) - return count + notification_count = Notification.query.filter_by(service_id=service_id).count() + notification_history_count = NotificationHistory.query.filter_by(service_id=service_id).count() + total_count = notification_count + notification_history_count + return total_count def get_notification_with_personalisation(service_id, notification_id, key_type): diff --git a/app/service/rest.py b/app/service/rest.py index 3c35dc183..a75f53b4f 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -1040,7 +1040,7 @@ def check_if_reply_to_address_already_in_use(service_id, email_address): ) -@service_blueprint.route("/service//notification-count", methods=["GET"]) -def get_notification_count_for_job_id(service_id): +@service_blueprint.route("//notification-count", methods=["GET"]) +def get_notification_count_for_service_id(service_id): count = dao_get_notification_count_for_service(service_id=service_id) return jsonify(count=count), 200 \ No newline at end of file