Adjusting some DAO stuff to send expired invites now.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>

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(
+    return InvitedUser.query.filter(InvitedUser.id == invited_user_id).one()
-        InvitedUser.id == invited_user_id, InvitedUser.status != INVITE_EXPIRED
-    ).one()
 
 
 def get_expired_invited_users_for_service(service_id):
-    return InvitedUser.query.filter(
+    return InvitedUser.query.filter(InvitedUser.service_id == service_id).all()
-        InvitedUser.service_id == service_id, InvitedUser.status == INVITE_EXPIRED
-    ).all()
 
 
 def get_invited_users_for_service(service_id):
-    return InvitedUser.query.filter(
+    return InvitedUser.query.filter(InvitedUser.service_id == service_id).all()
-        InvitedUser.service_id == service_id, InvitedUser.status != INVITE_EXPIRED
-    ).all()
 
 
 def expire_invitations_created_more_than_two_days_ago():

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