diff --git a/app/dao/invited_user_dao.py b/app/dao/invited_user_dao.py index 20ec5288c..c5eb75918 100644 --- a/app/dao/invited_user_dao.py +++ b/app/dao/invited_user_dao.py @@ -13,26 +13,19 @@ def get_invited_user_by_service_and_id(service_id, invited_user_id): return InvitedUser.query.filter( InvitedUser.service_id == service_id, InvitedUser.id == invited_user_id, - InvitedUser.status != INVITE_EXPIRED, ).one() def get_invited_user_by_id(invited_user_id): - return InvitedUser.query.filter( - InvitedUser.id == invited_user_id, InvitedUser.status != INVITE_EXPIRED - ).one() + return InvitedUser.query.filter(InvitedUser.id == invited_user_id).one() def get_expired_invited_users_for_service(service_id): - return InvitedUser.query.filter( - InvitedUser.service_id == service_id, InvitedUser.status == INVITE_EXPIRED - ).all() + return InvitedUser.query.filter(InvitedUser.service_id == service_id).all() def get_invited_users_for_service(service_id): - return InvitedUser.query.filter( - InvitedUser.service_id == service_id, InvitedUser.status != INVITE_EXPIRED - ).all() + return InvitedUser.query.filter(InvitedUser.service_id == service_id).all() def expire_invitations_created_more_than_two_days_ago(): diff --git a/tests/app/dao/test_invited_user_dao.py b/tests/app/dao/test_invited_user_dao.py index b0a7d75de..4242484c7 100644 --- a/tests/app/dao/test_invited_user_dao.py +++ b/tests/app/dao/test_invited_user_dao.py @@ -155,7 +155,18 @@ def test_should_not_delete_invitations_less_than_two_days_old( assert ( len(InvitedUser.query.filter(InvitedUser.status != INVITE_EXPIRED).all()) == 1 ) - assert InvitedUser.query.first().email_address == "valid@2.com" + assert ( + InvitedUser.query.filter(InvitedUser.status != INVITE_EXPIRED) + .first() + .email_address + == "valid@2.com" + ) + assert ( + InvitedUser.query.filter(InvitedUser.status == INVITE_EXPIRED) + .first() + .email_address + == "expired@1.com" + ) def make_invitation(user, service, age=None, email_address="test@test.com"):