Add default stream subscriptions using bulk queries.

(imported from commit f6d7415269cc74836c1c331741665b01cb1090cd)
This commit is contained in:
Tim Abbott
2013-06-28 10:54:10 -04:00
parent 703dec0344
commit 7f3fded612

View File

@@ -755,7 +755,7 @@ def set_default_streams(realm, stream_names):
def get_default_subs(user_profile): def get_default_subs(user_profile):
return [default.stream for default in return [default.stream for default in
DefaultStream.objects.filter(realm=user_profile.realm)] DefaultStream.objects.select_related("stream").filter(realm=user_profile.realm)]
@statsd_increment('user_activity') @statsd_increment('user_activity')
@transaction.commit_on_success @transaction.commit_on_success
@@ -991,8 +991,7 @@ def do_finish_tutorial(user_profile):
if len(streams) == 0: if len(streams) == 0:
streams = get_default_subs(user_profile) streams = get_default_subs(user_profile)
for stream in streams: bulk_add_subscriptions(streams, [user_profile])
do_add_subscription(user_profile, stream)
def gather_subscriptions(user_profile): def gather_subscriptions(user_profile):
# For now, don't display subscriptions for private messages. # For now, don't display subscriptions for private messages.