darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Successful notifications are deleted after a week now. All tests passing.

Browse Source
This commit is contained in:
Nicholas Staples
2016-04-05 11:07:21 +01:00
parent e465dc8bc4
commit 4d15409781
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/celery/tasks.py
View File

@@ -32,8 +32,7 @@ from app.dao.invited_user_dao import delete_invitations_created_more_than_two_da
from app.dao.notifications_dao import (
dao_create_notification,
dao_update_notification,
delete_failed_notifications_created_more_than_a_week_ago,
delete_successful_notifications_created_more_than_a_day_ago,
delete_notifications_created_more_than_a_week_ago,
dao_get_notification_statistics_for_service_and_day,
update_notification_reference_by_id
)
@@ -67,7 +66,7 @@ def delete_verify_codes():
def delete_successful_notifications():
try:
start = datetime.utcnow()
deleted = delete_successful_notifications_created_more_than_a_day_ago()
deleted = delete_notifications_created_more_than_a_week_ago('sent')
current_app.logger.info(
"Delete job started {} finished {} deleted {} successful notifications".format(
start,
@@ -84,7 +83,7 @@ def delete_successful_notifications():
def delete_failed_notifications():
try:
start = datetime.utcnow()
deleted = delete_failed_notifications_created_more_than_a_week_ago()
deleted = delete_notifications_created_more_than_a_week_ago('failed')
current_app.logger.info(
"Delete job started {} finished {} deleted {} failed notifications".format(
start,

8
app/dao/notifications_dao.py
View File

@@ -236,19 +236,19 @@ def filter_query(query, filter_dict=None):
return query
def delete_successful_notifications_created_more_than_a_day_ago():
def delete_notifications_created_more_than_a_day_ago(status):
deleted = db.session.query(Notification).filter(
Notification.created_at < datetime.utcnow() - timedelta(days=1),
Notification.status == 'sent'
Notification.status == status
).delete()
db.session.commit()
return deleted
def delete_failed_notifications_created_more_than_a_week_ago():
def delete_notifications_created_more_than_a_week_ago(status):
deleted = db.session.query(Notification).filter(
Notification.created_at < datetime.utcnow() - timedelta(days=7),
Notification.status == 'failed'
Notification.status == status
).delete()
db.session.commit()
return deleted