Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

do_deactivate_stream: Use transaction.atomic.

This commit is contained in:
Mateusz Mandera 2021-12-12 20:21:02 +01:00 committed by Tim Abbott
parent e025e85b77
commit 120de1db19
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/actions.py
View File

@ -1369,6 +1369,7 @@ def do_deactivate_user(
send_event(user_profile.realm, event, bot_owner_user_ids(user_profile)) send_event(user_profile.realm, event, bot_owner_user_ids(user_profile))
@transaction.atomic(savepoint=False)
def do_deactivate_stream( def do_deactivate_stream(
stream: Stream, log: bool = True, *, acting_user: Optional[UserProfile] stream: Stream, log: bool = True, *, acting_user: Optional[UserProfile]
) -> None: ) -> None:
@ -1381,7 +1382,7 @@ def do_deactivate_stream(
"type": "mark_stream_messages_as_read_for_everyone", "type": "mark_stream_messages_as_read_for_everyone",
"stream_recipient_id": stream.recipient_id, "stream_recipient_id": stream.recipient_id,
} }
queue_json_publish("deferred_work", deferred_work_event) transaction.on_commit(lambda: queue_json_publish("deferred_work", deferred_work_event))
# Get the affected user ids *before* we deactivate everybody. # Get the affected user ids *before* we deactivate everybody.
affected_user_ids = can_access_stream_user_ids(stream) affected_user_ids = can_access_stream_user_ids(stream)
@ -1424,7 +1425,7 @@ def do_deactivate_stream(
stream_dict = stream.to_dict() stream_dict = stream.to_dict()
stream_dict.update(dict(name=old_name, invite_only=was_invite_only)) stream_dict.update(dict(name=old_name, invite_only=was_invite_only))
event = dict(type="stream", op="delete", streams=[stream_dict]) event = dict(type="stream", op="delete", streams=[stream_dict])
send_event(stream.realm, event, affected_user_ids) transaction.on_commit(lambda: send_event(stream.realm, event, affected_user_ids))
event_time = timezone_now() event_time = timezone_now()
RealmAuditLog.objects.create( RealmAuditLog.objects.create(
@ -5772,7 +5773,7 @@ def notify_default_stream_groups(realm: Realm) -> None:
get_default_stream_groups(realm) get_default_stream_groups(realm)
), ),
) )
send_event(realm, event, active_non_guest_user_ids(realm.id)) transaction.on_commit(lambda: send_event(realm, event, active_non_guest_user_ids(realm.id)))
def do_add_default_stream(stream: Stream) -> None: def do_add_default_stream(stream: Stream) -> None:

3
zerver/tests/test_subs.py
View File

@ -1136,7 +1136,8 @@ class StreamAdminTest(ZulipTestCase):
self.assertFalse(new_stream_usermessage.flags.read) self.assertFalse(new_stream_usermessage.flags.read)
self.assertFalse(denmark_usermessage.flags.read) self.assertFalse(denmark_usermessage.flags.read)
do_deactivate_stream(stream, acting_user=None) with self.captureOnCommitCallbacks(execute=True):
do_deactivate_stream(stream, acting_user=None)
new_stream_usermessage.refresh_from_db() new_stream_usermessage.refresh_from_db()
denmark_usermessage.refresh_from_db() denmark_usermessage.refresh_from_db()
self.assertTrue(new_stream_usermessage.flags.read) self.assertTrue(new_stream_usermessage.flags.read)