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

drafts: Update do_delete_draft to send event on commit. 

Earlier, we were using 'send_event' in 'do_delete_draft' which
can lead to a situation, if any db operation is added after the
'send_event' in future, where we enqueue events but the action
function fails at a later stage.

Events should not be sent until we know we're not rolling back.

Fixes part of #30489.
This commit is contained in:
Prakhar Pratyush 2024-08-08 19:30:52 +05:30 committed by Tim Abbott
parent 096647fbd5
commit 0fddda232d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/drafts.py
View File

@ -18,7 +18,7 @@ from zerver.lib.streams import access_stream_by_id
from zerver.lib.timestamp import timestamp_to_datetime from zerver.lib.timestamp import timestamp_to_datetime
from zerver.lib.typed_endpoint import RequiredStringConstraint from zerver.lib.typed_endpoint import RequiredStringConstraint
from zerver.models import Draft, UserProfile from zerver.models import Draft, UserProfile
from zerver.tornado.django_api import send_event, send_event_on_commit from zerver.tornado.django_api import send_event_on_commit
ParamT = ParamSpec("ParamT") ParamT = ParamSpec("ParamT")
@ -150,6 +150,7 @@ def do_edit_draft(draft_id: int, draft: DraftData, user_profile: UserProfile) ->
send_event_on_commit(user_profile.realm, event, [user_profile.id]) send_event_on_commit(user_profile.realm, event, [user_profile.id])
@transaction.atomic(durable=True)
def do_delete_draft(draft_id: int, user_profile: UserProfile) -> None: def do_delete_draft(draft_id: int, user_profile: UserProfile) -> None:
"""Delete a draft belonging to a particular user.""" """Delete a draft belonging to a particular user."""
try: try:
@ -161,4 +162,4 @@ def do_delete_draft(draft_id: int, user_profile: UserProfile) -> None:
draft_object.delete() draft_object.delete()
event = {"type": "drafts", "op": "remove", "draft_id": draft_id} event = {"type": "drafts", "op": "remove", "draft_id": draft_id}
send_event(user_profile.realm, event, [user_profile.id]) send_event_on_commit(user_profile.realm, event, [user_profile.id])