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

emoji reactions: Order reactions query results by id. 

Force postgres to give reactions in ID order - which
is generally chronological order. Results in frontend
displaying reactions in said order.

Fixes #20060.
This commit is contained in:
Nipunn Koorapati 2021-11-29 16:47:09 -08:00 committed by Tim Abbott
parent 3714a30e63
commit 0ca49bc93a
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/models.py
View File

@ -2870,7 +2870,10 @@ class Reaction(AbstractReaction):
"user_profile_id", "user_profile_id",
"user_profile__full_name", "user_profile__full_name",
] ]
return Reaction.objects.filter(message_id__in=needed_ids).values(*fields) # The ordering is important here, as it makes it convenient
# for clients to display reactions in order without
# client-side sorting code.
return Reaction.objects.filter(message_id__in=needed_ids).values(*fields).order_by("id")
def __str__(self) -> str: def __str__(self) -> str:
return f"{self.user_profile.email} / {self.message.id} / {self.emoji_name}" return f"{self.user_profile.email} / {self.message.id} / {self.emoji_name}"

19
zerver/tests/test_reactions.py
View File

@ -87,29 +87,38 @@ class ReactionEmojiTest(ZulipTestCase):
""" """
Formatted reactions data is saved in cache. Formatted reactions data is saved in cache.
""" """
sender = self.example_user("hamlet") senders = [self.example_user("hamlet"), self.example_user("cordelia")]
emojis = ["smile", "tada"]
expected_emoji_codes = ["1f642", "1f389"]
for sender, emoji in zip(senders, emojis):
reaction_info = { reaction_info = {
"emoji_name": "smile", "emoji_name": emoji,
} }
result = self.api_post(sender, "/api/v1/messages/1/reactions", reaction_info) result = self.api_post(sender, "/api/v1/messages/1/reactions", reaction_info)
self.assert_json_success(result) self.assert_json_success(result)
self.assertEqual(200, result.status_code) self.assertEqual(200, result.status_code)
key = to_dict_cache_key_id(1) key = to_dict_cache_key_id(1)
message = extract_message_dict(cache_get(key)[0]) message = extract_message_dict(cache_get(key)[0])
expected_reaction_data = [ expected_reaction_data = [
{ {
"emoji_name": "smile", "emoji_name": emoji,
"emoji_code": "1f642", "emoji_code": emoji_code,
"reaction_type": "unicode_emoji", "reaction_type": "unicode_emoji",
"user": { "user": {
"email": f"user{sender.id}@zulip.testserver", "email": f"user{sender.id}@zulip.testserver",
"id": sender.id, "id": sender.id,
"full_name": "King Hamlet", "full_name": sender.full_name,
}, },
"user_id": sender.id, "user_id": sender.id,
} }
# It's important that we preserve the loop order in this
# test, since this is our test to verify that we're
# returning reactions in chronological order.
for sender, emoji, emoji_code in zip(senders, emojis, expected_emoji_codes)
] ]
self.assertEqual(expected_reaction_data, message["reactions"]) self.assertEqual(expected_reaction_data, message["reactions"])