darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 23:41:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjusting some DAO stuff to send expired invites now.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2023-11-29 16:08:02 -05:00
parent 68b023b2f9
commit c04df94b22
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/dao/invited_user_dao.py
View File

@@ -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():

13
tests/app/dao/test_invited_user_dao.py
View File

@@ -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"):