darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Working on getting expiration implemented.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2023-11-07 15:28:27 -05:00
parent 570ee6cd86
commit 3e6a7931d8
7 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/celery/scheduled_tasks.py
View File

@@ -16,7 +16,7 @@ from app.config import QueueNames
from app.dao.invited_org_user_dao import (
delete_org_invitations_created_more_than_two_days_ago,
)
from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
from app.dao.invited_user_dao import expire_invitations_created_more_than_two_days_ago
from app.dao.jobs_dao import (
dao_set_scheduled_jobs_to_pending,
dao_update_job,
@@ -68,17 +68,20 @@ def delete_verify_codes():
raise
@notify_celery.task(name="delete-invitations")
def delete_invitations():
@notify_celery.task(name="expire-or-delete-invitations")
def expire_or_delete_invitations():
try:
start = datetime.utcnow()
deleted_invites = delete_invitations_created_more_than_two_days_ago()
deleted_invites += delete_org_invitations_created_more_than_two_days_ago()
current_app.logger.info(
"Delete job started {} finished {} deleted {} invitations".format(
start, datetime.utcnow(), deleted_invites
)
)
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")
except SQLAlchemyError:
current_app.logger.exception("Failed to expire invitations")
raise
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")
except SQLAlchemyError:
current_app.logger.exception("Failed to delete invitations")
raise