Working on getting tests working.

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

app/celery/scheduled_tasks.py

@@ -73,7 +73,9 @@ def expire_or_delete_invitations():
     try:
         start = datetime.utcnow()
         expired_invites = expire_invitations_created_more_than_two_days_ago()
-        current_app.logger.info(f"Expire job started {start} finished {datetime.utcnow()} expired {len(expired_invites)} invitations")
+        current_app.logger.info(
+            f"Expire job started {start} finished {datetime.utcnow()} expired {expired_invites} invitations"
+        )
     except SQLAlchemyError:
         current_app.logger.exception("Failed to expire invitations")
         raise
@@ -81,7 +83,9 @@ def expire_or_delete_invitations():
     try:
         start = datetime.utcnow()
         deleted_invites = delete_org_invitations_created_more_than_two_days_ago()
-        current_app.logger.info(f"Delete job started {start} finished {datetime.utcnow()} deleted {len(deleted_invites)} invitations")
+        current_app.logger.info(
+            f"Delete job started {start} finished {datetime.utcnow()} deleted {deleted_invites} invitations"
+        )
     except SQLAlchemyError:
         current_app.logger.exception("Failed to delete invitations")
         raise

app/dao/invited_user_dao.py

@@ -10,15 +10,29 @@ def save_invited_user(invited_user):
 
 
 def get_invited_user_by_service_and_id(service_id, invited_user_id):
-    return InvitedUser.query.filter_by(service_id=service_id, id=invited_user_id).one()
+    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_by(id=invited_user_id).one()
+    return InvitedUser.query.filter(
+        InvitedUser.id == invited_user_id, InvitedUser.status != INVITE_EXPIRED
+    ).one()
+
+
+def get_expired_invited_users_for_service(service_id):
+    return InvitedUser.query.filter(
+        InvitedUser.service_id == service_id, InvitedUser.status == INVITE_EXPIRED
+    ).all()
 
 
 def get_invited_users_for_service(service_id):
-    return InvitedUser.query.filter_by(service_id=service_id).all()
+    return InvitedUser.query.filter(
+        InvitedUser.service_id == service_id, InvitedUser.status != INVITE_EXPIRED
+    ).all()
 
 
 def expire_invitations_created_more_than_two_days_ago():

app/models.py

@@ -1888,7 +1888,12 @@ INVITE_PENDING = "pending"
 INVITE_ACCEPTED = "accepted"
 INVITE_CANCELLED = "cancelled"
 INVITE_EXPIRED = "expired"
-INVITED_USER_STATUS_TYPES = [INVITE_PENDING, INVITE_ACCEPTED, INVITE_CANCELLED, INVITE_EXPIRED]
+INVITED_USER_STATUS_TYPES = [
+    INVITE_PENDING,
+    INVITE_ACCEPTED,
+    INVITE_CANCELLED,
+    INVITE_EXPIRED,
+]
 
 
 class InviteStatusType(db.Model):

app/service_invite/rest.py

@@ -4,6 +4,7 @@ from notifications_utils.url_safe_token import check_token, generate_token
 
 from app.config import QueueNames
 from app.dao.invited_user_dao import (
+    get_expired_invited_users_for_service,
     get_invited_user_by_id,
     get_invited_user_by_service_and_id,
     get_invited_users_for_service,
@@ -58,6 +59,12 @@ def create_invited_user(service_id):
     return jsonify(data=invited_user_schema.dump(invited_user)), 201
 
 
+@service_invite.route("/service/<service_id>/invite/expired", methods=["GET"])
+def get_expired_invited_users_by_service(service_id):
+    expired_invited_users = get_expired_invited_users_for_service(service_id)
+    return jsonify(data=invited_user_schema.dump(expired_invited_users, many=True)), 200
+
+
 @service_invite.route("/service/<service_id>/invite", methods=["GET"])
 def get_invited_users_by_service(service_id):
     invited_users = get_invited_users_for_service(service_id)