paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

invites: Add atomic() around some invite-revoking blocks.

Browse Source 
These should only ever happen together, so should be wrapped in
atomic().
This commit is contained in:
Mateusz Mandera
2022-10-31 21:41:46 +01:00
committed by Tim Abbott
parent 656f2c6f5f
commit 3dd0545118
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/actions/invites.py
View File

@@ -3,6 +3,7 @@ from typing import Any, Collection, Dict, List, Optional, Sequence, Set, Tuple,
from django.conf import settings from django.conf import settings
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.db import transaction
from django.db.models import Q, Sum from django.db.models import Q, Sum
from django.utils.timezone import now as timezone_now from django.utils.timezone import now as timezone_now
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
@@ -376,6 +377,7 @@ def do_revoke_user_invite(prereg_user: PreregistrationUser) -> None:
# to a "revoked" status so that we can give the invited user a better # to a "revoked" status so that we can give the invited user a better
# error message. # error message.
content_type = ContentType.objects.get_for_model(PreregistrationUser) content_type = ContentType.objects.get_for_model(PreregistrationUser)
with transaction.atomic():
Confirmation.objects.filter(content_type=content_type, object_id=prereg_user.id).delete() Confirmation.objects.filter(content_type=content_type, object_id=prereg_user.id).delete()
prereg_user.delete() prereg_user.delete()
clear_scheduled_invitation_emails(email) clear_scheduled_invitation_emails(email)
@@ -386,7 +388,10 @@ def do_revoke_multi_use_invite(multiuse_invite: MultiuseInvite) -> None:
realm = multiuse_invite.referred_by.realm realm = multiuse_invite.referred_by.realm
content_type = ContentType.objects.get_for_model(MultiuseInvite) content_type = ContentType.objects.get_for_model(MultiuseInvite)
Confirmation.objects.filter(content_type=content_type, object_id=multiuse_invite.id).delete() with transaction.atomic():
Confirmation.objects.filter(
content_type=content_type, object_id=multiuse_invite.id
).delete()
multiuse_invite.delete() multiuse_invite.delete()
notify_invites_changed(realm) notify_invites_changed(realm)