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

Use more caching of UserProfile objects in views. 

(imported from commit 3abcceeb4fac1cfa5a9944a6455c60f6512dce6e)
This commit is contained in:
Tim Abbott 2013-03-18 12:03:29 -04:00
parent a23f6be28d
commit c1d3a5b5e5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zephyr/views.py
View File

@ -32,7 +32,8 @@ from zephyr.decorator import require_post, \
authenticated_api_view, authenticated_json_post_view, \ authenticated_api_view, authenticated_json_post_view, \
has_request_variables, POST, authenticated_json_view, \ has_request_variables, POST, authenticated_json_view, \
to_non_negative_int, json_to_dict, json_to_list, json_to_bool, \ to_non_negative_int, json_to_dict, json_to_list, json_to_bool, \
JsonableError, RequestVariableMissingError JsonableError, RequestVariableMissingError, get_user_profile_by_email, \
get_user_profile_by_user_id
from zephyr.lib.query import last_n from zephyr.lib.query import last_n
from zephyr.lib.avatar import gravatar_hash from zephyr.lib.avatar import gravatar_hash
from zephyr.lib.response import json_success, json_error from zephyr.lib.response import json_success, json_error
@ -134,7 +135,7 @@ class PrincipalError(JsonableError):
def principal_to_user_profile(agent, principal): def principal_to_user_profile(agent, principal):
principal_doesnt_exist = False principal_doesnt_exist = False
try: try:
principal_user_profile = UserProfile.objects.get(user__email__iexact=principal) principal_user_profile = get_user_profile_by_email(principal)
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
principal_doesnt_exist = True principal_doesnt_exist = True
@ -379,7 +380,7 @@ def home(request):
# session alive. # session alive.
request.session.modified = True request.session.modified = True
user_profile = UserProfile.objects.get(user=request.user) user_profile = get_user_profile_by_user_id(request.user.id)
num_messages = UserMessage.objects.filter(user_profile=user_profile).count() num_messages = UserMessage.objects.filter(user_profile=user_profile).count()
@ -550,7 +551,7 @@ class NarrowBuilder(object):
# Personals with other user; include both directions. # Personals with other user; include both directions.
try: try:
narrow_profile = UserProfile.objects.get(user__email__iexact=operand) narrow_profile = get_user_profile_by_email(operand)
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
raise BadNarrowOperator('unknown user ' + operand) raise BadNarrowOperator('unknown user ' + operand)
@ -754,14 +755,14 @@ def create_mirrored_message_users(request, user_profile, recipients):
for email in referenced_users: for email in referenced_users:
create_mit_user_if_needed(user_profile.realm, email) create_mit_user_if_needed(user_profile.realm, email)
sender = UserProfile.objects.get(user__email__iexact=sender_email) sender = get_user_profile_by_email(sender_email)
return (True, sender) return (True, sender)
def recipient_for_emails(emails, not_forged_zephyr_mirror, user_profile, sender): def recipient_for_emails(emails, not_forged_zephyr_mirror, user_profile, sender):
recipient_profile_ids = set() recipient_profile_ids = set()
for email in emails: for email in emails:
try: try:
recipient_profile_ids.add(UserProfile.objects.get(user__email__iexact=email).id) recipient_profile_ids.add(get_user_profile_by_email(email).id)
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
raise ValidationError("Invalid email '%s'" % (email,)) raise ValidationError("Invalid email '%s'" % (email,))