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

check-schemas: Remove unnecessary special case for saved_snippets.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2025-01-02 12:33:08 -08:00
committed by Tim Abbott
parent c5feccaa34
commit 7ce49a709e
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/check-schemas
View File

@@ -61,11 +61,6 @@ def get_event_checker(event: dict[str, Any]) -> Callable[[str, dict[str, Any]],
# Start by grabbing the event type. # Start by grabbing the event type.
name = event["type"] name = event["type"]
# Work around the fact that we send a "saved_snippets" (plural)
# event type for an event that really just sends a single value.
if name == "saved_snippets":
name = "saved_snippet"
# Handle things like AttachmentRemoveEvent # Handle things like AttachmentRemoveEvent
if "op" in event: if "op" in event:
name += "_" + event["op"].title() name += "_" + event["op"].title()

8
zerver/lib/event_schema.py
View File

@@ -54,8 +54,8 @@ from zerver.lib.event_types import (
EventRealmUserSettingsDefaultsUpdate, EventRealmUserSettingsDefaultsUpdate,
EventRealmUserUpdate, EventRealmUserUpdate,
EventRestart, EventRestart,
EventSavedSnippetAdd, EventSavedSnippetsAdd,
EventSavedSnippetRemove, EventSavedSnippetsRemove,
EventScheduledMessagesAdd, EventScheduledMessagesAdd,
EventScheduledMessagesRemove, EventScheduledMessagesRemove,
EventScheduledMessagesUpdate, EventScheduledMessagesUpdate,
@@ -156,8 +156,8 @@ check_realm_playgrounds = make_checker(EventRealmPlaygrounds)
check_realm_user_add = make_checker(EventRealmUserAdd) check_realm_user_add = make_checker(EventRealmUserAdd)
check_realm_user_remove = make_checker(EventRealmUserRemove) check_realm_user_remove = make_checker(EventRealmUserRemove)
check_restart = make_checker(EventRestart) check_restart = make_checker(EventRestart)
check_saved_snippet_add = make_checker(EventSavedSnippetAdd) check_saved_snippets_add = make_checker(EventSavedSnippetsAdd)
check_saved_snippet_remove = make_checker(EventSavedSnippetRemove) check_saved_snippets_remove = make_checker(EventSavedSnippetsRemove)
check_scheduled_message_add = make_checker(EventScheduledMessagesAdd) check_scheduled_message_add = make_checker(EventScheduledMessagesAdd)
check_scheduled_message_remove = make_checker(EventScheduledMessagesRemove) check_scheduled_message_remove = make_checker(EventScheduledMessagesRemove)
check_scheduled_message_update = make_checker(EventScheduledMessagesUpdate) check_scheduled_message_update = make_checker(EventScheduledMessagesUpdate)

4
zerver/lib/event_types.py
View File

@@ -719,14 +719,14 @@ class SavedSnippetFields(BaseModel):
date_created: int date_created: int
class EventSavedSnippetAdd(BaseModel): class EventSavedSnippetsAdd(BaseModel):
type: Literal["saved_snippets"] type: Literal["saved_snippets"]
op: Literal["add"] op: Literal["add"]
saved_snippet: SavedSnippetFields saved_snippet: SavedSnippetFields
id: int id: int
class EventSavedSnippetRemove(BaseModel): class EventSavedSnippetsRemove(BaseModel):
type: Literal["saved_snippets"] type: Literal["saved_snippets"]
op: Literal["remove"] op: Literal["remove"]
saved_snippet_id: int saved_snippet_id: int

8
zerver/tests/test_events.py
View File

@@ -175,8 +175,8 @@ from zerver.lib.event_schema import (
check_realm_user_add, check_realm_user_add,
check_realm_user_remove, check_realm_user_remove,
check_realm_user_update, check_realm_user_update,
check_saved_snippet_add, check_saved_snippets_add,
check_saved_snippet_remove, check_saved_snippets_remove,
check_scheduled_message_add, check_scheduled_message_add,
check_scheduled_message_remove, check_scheduled_message_remove,
check_scheduled_message_update, check_scheduled_message_update,
@@ -1676,14 +1676,14 @@ class NormalActionsTest(BaseAction):
def test_saved_replies_events(self) -> None: def test_saved_replies_events(self) -> None:
with self.verify_action() as events: with self.verify_action() as events:
do_create_saved_snippet("Welcome message", "Welcome", self.user_profile) do_create_saved_snippet("Welcome message", "Welcome", self.user_profile)
check_saved_snippet_add("events[0]", events[0]) check_saved_snippets_add("events[0]", events[0])
saved_snippet_id = ( saved_snippet_id = (
SavedSnippet.objects.filter(user_profile=self.user_profile).order_by("id")[0].id SavedSnippet.objects.filter(user_profile=self.user_profile).order_by("id")[0].id
) )
with self.verify_action() as events: with self.verify_action() as events:
do_delete_saved_snippet(saved_snippet_id, self.user_profile) do_delete_saved_snippet(saved_snippet_id, self.user_profile)
check_saved_snippet_remove("events[0]", events[0]) check_saved_snippets_remove("events[0]", events[0])
def test_away_events(self) -> None: def test_away_events(self) -> None:
client = get_client("website") client = get_client("website")