Renamed some files and fixed a bug on deleting the failed notifications

This commit is contained in:
Martyn Inglis
2016-03-10 09:34:27 +00:00
parent c8a5366484
commit 976a4c06e3
7 changed files with 30 additions and 24 deletions

View File

@@ -9,7 +9,7 @@ from app.dao.invited_user_dao import (
get_invited_user,
get_invited_users_for_service,
get_invited_user_by_id,
delete_invitations_older_created_more_than_a_day_ago
delete_invitations_created_more_than_two_days_ago
)
@@ -91,23 +91,23 @@ def test_save_invited_user_sets_status_to_cancelled(notify_db, notify_db_session
def test_should_delete_all_invitations_more_than_one_day_old(
sample_user,
sample_service):
make_invitation(sample_user, sample_service, age=timedelta(hours=24))
make_invitation(sample_user, sample_service, age=timedelta(hours=24))
make_invitation(sample_user, sample_service, age=timedelta(hours=48))
make_invitation(sample_user, sample_service, age=timedelta(hours=48))
assert len(InvitedUser.query.all()) == 2
delete_invitations_older_created_more_than_a_day_ago()
delete_invitations_created_more_than_two_days_ago()
assert len(InvitedUser.query.all()) == 0
def test_should_not_delete_invitations_less_than_one_day_old(
def test_should_not_delete_invitations_less_than_two_days_old(
sample_user,
sample_service):
make_invitation(sample_user, sample_service, age=timedelta(hours=23, minutes=59, seconds=59),
make_invitation(sample_user, sample_service, age=timedelta(hours=47, minutes=59, seconds=59),
email_address="valid@2.com")
make_invitation(sample_user, sample_service, age=timedelta(hours=24),
make_invitation(sample_user, sample_service, age=timedelta(hours=48),
email_address="expired@1.com")
assert len(InvitedUser.query.all()) == 2
delete_invitations_older_created_more_than_a_day_ago()
delete_invitations_created_more_than_two_days_ago()
assert len(InvitedUser.query.all()) == 1
assert InvitedUser.query.first().email_address == "valid@2.com"