From affc5e7aff5a8bbc562dba5b154e8bca0cabb222 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Wed, 20 Dec 2023 09:51:43 -0500 Subject: [PATCH] Fixing stuff. Signed-off-by: Cliff Hill --- app/dao/invited_user_dao.py | 8 ++++++++ app/service_invite/rest.py | 12 +++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/dao/invited_user_dao.py b/app/dao/invited_user_dao.py index ad4ab0a65..2e807c069 100644 --- a/app/dao/invited_user_dao.py +++ b/app/dao/invited_user_dao.py @@ -16,6 +16,14 @@ def get_invited_user_by_service_and_id(service_id, invited_user_id): ).one() +def get_expired_invite_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).one() diff --git a/app/service_invite/rest.py b/app/service_invite/rest.py index 19102c12b..e18d158ac 100644 --- a/app/service_invite/rest.py +++ b/app/service_invite/rest.py @@ -6,6 +6,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_invite_by_service_and_id, get_expired_invited_users_for_service, get_invited_user_by_id, get_invited_user_by_service_and_id, @@ -14,13 +15,7 @@ from app.dao.invited_user_dao import ( ) from app.dao.templates_dao import dao_get_template_by_id from app.errors import InvalidRequest, register_errors -from app.models import ( - EMAIL_TYPE, - INVITE_EXPIRED, - INVITE_PENDING, - KEY_TYPE_NORMAL, - Service, -) +from app.models import EMAIL_TYPE, INVITE_PENDING, KEY_TYPE_NORMAL, Service from app.notifications.process_notifications import ( persist_notification, send_notification_to_queue, @@ -114,10 +109,9 @@ def resend_service_invite(service_id, invited_user_id): Note: This ignores the POST data entirely. """ - fetched = get_invited_user_by_service_and_id( + fetched = get_expired_invite_by_service_and_id( service_id=service_id, invited_user_id=invited_user_id, - status=INVITE_EXPIRED, ) fetched.created_at = datetime.utcnow()