paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 06:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract UserPresence.get_status_dicts_for_rows().

Browse Source 
The prior version of this function was passed in a QuerySet, which
made it difficult to effectively profile the callers, and there
is really no compelling reason to pass in a query any more.
This commit is contained in:
Steve Howell
2017-09-13 07:43:02 -07:00
committed by Tim Abbott
parent 5294e10801
commit aade317d87
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/models.py
View File

@@ -1641,12 +1641,13 @@ class UserPresence(models.Model):
'user_profile__id', 'user_profile__id',
'user_profile__enable_offline_push_notifications', 'user_profile__enable_offline_push_notifications',
) )
presence_rows = list(query)
mobile_user_ids = set() # type: Set[int] mobile_user_ids = set() # type: Set[int]
if PushDeviceToken.objects.filter(user=user_profile).exists(): if PushDeviceToken.objects.filter(user=user_profile).exists():
mobile_user_ids.add(user_profile.id) mobile_user_ids.add(user_profile.id)
return UserPresence.get_status_dicts_for_query(query, mobile_user_ids) return UserPresence.get_status_dicts_for_rows(presence_rows, mobile_user_ids)
@staticmethod @staticmethod
def exclude_old_users(query): def exclude_old_users(query):
@@ -1682,6 +1683,7 @@ class UserPresence(models.Model):
'user_profile__id', 'user_profile__id',
'user_profile__enable_offline_push_notifications', 'user_profile__enable_offline_push_notifications',
) )
presence_rows = list(query)
mobile_query = PushDeviceToken.objects.filter( mobile_query = PushDeviceToken.objects.filter(
user_id__in=user_profile_ids, user_id__in=user_profile_ids,
@@ -1689,14 +1691,14 @@ class UserPresence(models.Model):
mobile_user_ids = set(mobile_query.distinct("user_id").values_list("user_id", flat=True)) mobile_user_ids = set(mobile_query.distinct("user_id").values_list("user_id", flat=True))
return UserPresence.get_status_dicts_for_query(query, mobile_user_ids) return UserPresence.get_status_dicts_for_rows(presence_rows, mobile_user_ids)
@staticmethod @staticmethod
def get_status_dicts_for_query(query, mobile_user_ids): def get_status_dicts_for_rows(presence_rows, mobile_user_ids):
# type: (QuerySet, Set[int]) -> Dict[Text, Dict[Any, Any]] # type: (List[Dict[str, Any]], Set[int]) -> Dict[Text, Dict[Any, Any]]
info_row_dct = defaultdict(list) # type: DefaultDict[Text, List[Dict[str, Any]]] info_row_dct = defaultdict(list) # type: DefaultDict[Text, List[Dict[str, Any]]]
for row in query: for row in presence_rows:
email = row['user_profile__email'] email = row['user_profile__email']
client_name = row['client__name'] client_name = row['client__name']
status = UserPresence.status_to_string(row['status']) status = UserPresence.status_to_string(row['status'])