darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add notification history and notification to count

Browse Source
This commit is contained in:
Andrew Shumway
2023-10-23 10:24:00 -06:00
committed by Carlo Costino
parent db7aa969cd
commit 32dca0f5e0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dao/notifications_dao.py
View File

@@ -191,9 +191,10 @@ def dao_get_notification_count_for_job_id(*, job_id):
def dao_get_notification_count_for_service(*, service_id): def dao_get_notification_count_for_service(*, service_id):
count = Notification.query.filter_by(service_id=service_id).count() notification_count = Notification.query.filter_by(service_id=service_id).count()
print(count) notification_history_count = NotificationHistory.query.filter_by(service_id=service_id).count()
return count total_count = notification_count + notification_history_count
return total_count
def get_notification_with_personalisation(service_id, notification_id, key_type): def get_notification_with_personalisation(service_id, notification_id, key_type):

4
app/service/rest.py
View File

@@ -1040,7 +1040,7 @@ def check_if_reply_to_address_already_in_use(service_id, email_address):
) )
@service_blueprint.route("/service/<uuid:service_id>/notification-count", methods=["GET"]) @service_blueprint.route("/<uuid:service_id>/notification-count", methods=["GET"])
def get_notification_count_for_job_id(service_id): def get_notification_count_for_service_id(service_id):
count = dao_get_notification_count_for_service(service_id=service_id) count = dao_get_notification_count_for_service(service_id=service_id)
return jsonify(count=count), 200 return jsonify(count=count), 200