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

Removed unused code

Browse Source
This commit is contained in:
Adam Shimali
2016-04-25 17:21:55 +01:00
parent 9bb3214b1c
commit 886f302993
2 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dao/notifications_dao.py
View File

@@ -256,16 +256,6 @@ def filter_query(query, filter_dict=None):
return query return query
def delete_notifications_created_more_than_a_day_ago(status):
one_day_ago = date.today() - timedelta(days=1)
deleted = db.session.query(Notification).filter(
func.date(Notification.created_at) < one_day_ago,
Notification.status == status
).delete(synchronize_session='fetch')
db.session.commit()
return deleted
def delete_notifications_created_more_than_a_week_ago(status): def delete_notifications_created_more_than_a_week_ago(status):
seven_days_ago = date.today() - timedelta(days=7) seven_days_ago = date.today() - timedelta(days=7)
deleted = db.session.query(Notification).filter( deleted = db.session.query(Notification).filter(

22
tests/app/dao/test_notification_dao.py
View File

@@ -22,7 +22,6 @@ from app.dao.notifications_dao import (
get_notification_for_job, get_notification_for_job,
get_notifications_for_job, get_notifications_for_job,
dao_get_notification_statistics_for_service, dao_get_notification_statistics_for_service,
delete_notifications_created_more_than_a_day_ago,
delete_notifications_created_more_than_a_week_ago, delete_notifications_created_more_than_a_week_ago,
dao_get_notification_statistics_for_service_and_day, dao_get_notification_statistics_for_service_and_day,
dao_get_notification_statistics_for_service_and_previous_days, dao_get_notification_statistics_for_service_and_previous_days,
@@ -765,15 +764,6 @@ def test_update_notification(sample_notification, sample_template):
assert notification_from_db.status == 'failed' assert notification_from_db.status == 'failed'
def test_should_delete_notifications_after_one_day(notify_db, notify_db_session):
created_at = datetime.utcnow() - timedelta(days=2)
sample_notification(notify_db, notify_db_session, created_at=created_at)
sample_notification(notify_db, notify_db_session, created_at=created_at)
assert len(Notification.query.all()) == 2
delete_notifications_created_more_than_a_day_ago('sending')
assert len(Notification.query.all()) == 0
@freeze_time("2016-01-10 12:00:00.000000") @freeze_time("2016-01-10 12:00:00.000000")
def test_should_delete_notifications_after_seven_days(notify_db, notify_db_session): def test_should_delete_notifications_after_seven_days(notify_db, notify_db_session):
@@ -795,18 +785,6 @@ def test_should_delete_notifications_after_seven_days(notify_db, notify_db_sessi
assert remaining_notifications[0].created_at.date() == date(2016, 1, 3) assert remaining_notifications[0].created_at.date() == date(2016, 1, 3)
def test_should_not_delete_sent_notifications_before_one_day(notify_db, notify_db_session):
should_delete = datetime.utcnow() - timedelta(days=2)
do_not_delete = datetime.utcnow() - timedelta(days=1)
sample_notification(notify_db, notify_db_session, created_at=should_delete, to_field="expired")
sample_notification(notify_db, notify_db_session, created_at=do_not_delete, to_field="valid")
assert len(Notification.query.all()) == 2
delete_notifications_created_more_than_a_day_ago('sending')
assert len(Notification.query.all()) == 1
assert Notification.query.first().to == 'valid'
def test_should_not_delete_failed_notifications_before_seven_days(notify_db, notify_db_session): def test_should_not_delete_failed_notifications_before_seven_days(notify_db, notify_db_session):
should_delete = datetime.utcnow() - timedelta(days=8) should_delete = datetime.utcnow() - timedelta(days=8)
do_not_delete = datetime.utcnow() - timedelta(days=7) do_not_delete = datetime.utcnow() - timedelta(days=7)