darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-02 17:48:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

add caching for db calls to prevent excessive UI polling

Browse Source
This commit is contained in:
Kenneth Kehl
2025-09-26 09:31:05 -07:00
parent 212fabc1b0
commit b77eb5f5c0
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/jobs_dao.py
View File

@@ -18,9 +18,10 @@ from app.models import (
) )
from app.utils import midnight_n_days_ago, utc_now from app.utils import midnight_n_days_ago, utc_now
dao_cache = TTLCache(maxsize=128, ttl=30) dao_cache = TTLCache(maxsize=256, ttl=30)
@cached(dao_cache)
def dao_get_notification_outcomes_for_job(service_id, job_id): def dao_get_notification_outcomes_for_job(service_id, job_id):
stmt = ( stmt = (
select(func.count(Notification.status).label("count"), Notification.status) select(func.count(Notification.status).label("count"), Notification.status)
@@ -54,7 +55,7 @@ def dao_get_unfinished_jobs():
return db.session.execute(stmt).scalars().all() return db.session.execute(stmt).scalars().all()
# @cached(dao_cache) # TODO can't cache yet because statuses is list, which is not hashable
def dao_get_jobs_by_service_id( def dao_get_jobs_by_service_id(
service_id, service_id,
*, *,

10
app/dao/notifications_dao.py
View File

@@ -3,6 +3,7 @@ import os
from datetime import datetime, timedelta from datetime import datetime, timedelta
from time import time from time import time
from cachetools import TTLCache, cached
from flask import current_app from flask import current_app
from sqlalchemy import ( from sqlalchemy import (
TIMESTAMP, TIMESTAMP,
@@ -43,7 +44,10 @@ from notifications_utils.recipients import (
validate_and_format_email_address, validate_and_format_email_address,
) )
dao_cache = TTLCache(maxsize=256, ttl=30)
@cached(dao_cache)
def dao_get_last_date_template_was_used(template_id, service_id): def dao_get_last_date_template_was_used(template_id, service_id):
last_date_from_notifications = ( last_date_from_notifications = (
db.session.query(functions.max(Notification.created_at)) db.session.query(functions.max(Notification.created_at))
@@ -248,6 +252,7 @@ def dao_update_notification(notification):
db.session.add(notification) db.session.add(notification)
# TODO not cachable because of filter_dict not hashable
def get_notifications_for_job( def get_notifications_for_job(
service_id, job_id, filter_dict=None, page=1, page_size=None service_id, job_id, filter_dict=None, page=1, page_size=None
): ):
@@ -269,6 +274,7 @@ def get_notifications_for_job(
return pagination return pagination
# TODO not cachable because of filter_dict not hashable
def get_recent_notifications_for_job( def get_recent_notifications_for_job(
service_id, job_id, filter_dict=None, page=1, page_size=None service_id, job_id, filter_dict=None, page=1, page_size=None
): ):
@@ -292,11 +298,13 @@ def get_recent_notifications_for_job(
return pagination return pagination
@cached(dao_cache)
def dao_get_notification_count_for_job_id(*, job_id): def dao_get_notification_count_for_job_id(*, job_id):
stmt = select(func.count(Notification.id)).where(Notification.job_id == job_id) stmt = select(func.count(Notification.id)).where(Notification.job_id == job_id)
return db.session.execute(stmt).scalar() return db.session.execute(stmt).scalar()
@cached(dao_cache)
def dao_get_notification_count_for_service(*, service_id): def dao_get_notification_count_for_service(*, service_id):
stmt = select(func.count(Notification.id)).where( stmt = select(func.count(Notification.id)).where(
Notification.service_id == service_id Notification.service_id == service_id
@@ -304,6 +312,7 @@ def dao_get_notification_count_for_service(*, service_id):
return db.session.execute(stmt).scalar() return db.session.execute(stmt).scalar()
@cached(dao_cache)
def dao_get_notification_count_for_service_message_ratio(service_id, current_year): def dao_get_notification_count_for_service_message_ratio(service_id, current_year):
start_date = datetime(current_year, 6, 16) start_date = datetime(current_year, 6, 16)
end_date = datetime(current_year + 1, 6, 16) end_date = datetime(current_year + 1, 6, 16)
@@ -342,6 +351,7 @@ def dao_get_notification_count_for_service_message_ratio(service_id, current_yea
return recent_count + old_count return recent_count + old_count
@cached(dao_cache)
def dao_get_failed_notification_count(): def dao_get_failed_notification_count():
stmt = select(func.count(Notification.id)).where( stmt = select(func.count(Notification.id)).where(
Notification.status == NotificationStatus.FAILED Notification.status == NotificationStatus.FAILED