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

Refactor generate_topic_history_from_db_rows. 

Sorting the rows first simplifies the loop logic here.

This has good test coverage--you'll get a failing
test if you comment out the sort.
This commit is contained in:
Steve Howell 2018-08-11 14:08:30 +00:00 committed by Tim Abbott
parent 71d46083da
commit 5bc33213c9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/actions.py
View File

@ -220,15 +220,14 @@ def activity_change_requires_seat_update(user: UserProfile) -> bool:
def generate_topic_history_from_db_rows(rows: List[Tuple[str, int]]) -> List[Dict[str, Any]]:
canonical_topic_names = {} # type: Dict[str, Tuple[int, str]]
# Sort rows by max_message_id so that if a topic
# has many different casings, we use the most
# recent row.
rows = sorted(rows, key=lambda tup: tup[1])
for (topic_name, max_message_id) in rows:
canonical_name = topic_name.lower()
if canonical_name not in canonical_topic_names:
canonical_topic_names[canonical_name] = (max_message_id, topic_name)
continue
if max_message_id > canonical_topic_names[canonical_name][0]:
canonical_topic_names[canonical_name] = (max_message_id, topic_name)
canonical_topic_names[canonical_name] = (max_message_id, topic_name)
history = []
for canonical_topic, (max_message_id, topic_name) in canonical_topic_names.items():