stream: Rename function to get defaults for stream permission groups.

analytics/management/commands/populate_analytics_db.py

@@ -23,7 +23,7 @@ from zerver.lib.create_user import create_user
 from zerver.lib.management import ZulipBaseCommand
 from zerver.lib.storage import static_path
 from zerver.lib.stream_color import STREAM_ASSIGNMENT_COLORS
-from zerver.lib.streams import get_default_group_setting_values
+from zerver.lib.streams import get_default_values_for_stream_permission_group_settings
 from zerver.lib.timestamp import floor_to_day
 from zerver.lib.upload import upload_message_attachment_from_request
 from zerver.models import Client, Realm, RealmAuditLog, Recipient, Stream, Subscription, UserProfile
@@ -110,7 +110,7 @@ class Command(ZulipBaseCommand):
             name="all",
             realm=realm,
             date_created=installation_time,
-            **get_default_group_setting_values(realm),
+            **get_default_values_for_stream_permission_group_settings(realm),
         )
         recipient = Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
         stream.recipient = recipient

analytics/tests/test_counts.py

@@ -55,7 +55,7 @@ from zerver.lib.push_notifications import (
     get_message_payload_gcm,
     hex_to_b64,
 )
-from zerver.lib.streams import get_default_group_setting_values
+from zerver.lib.streams import get_default_values_for_stream_permission_group_settings
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.lib.test_helpers import activate_push_notification_service
 from zerver.lib.timestamp import TimeZoneNotUTCError, ceiling_to_day, floor_to_day
@@ -165,7 +165,7 @@ class AnalyticsTestCase(ZulipTestCase):
             "name": f"stream name {self.name_counter}",
             "realm": self.default_realm,
             "date_created": self.TIME_LAST_HOUR,
-            **get_default_group_setting_values(self.default_realm),
+            **get_default_values_for_stream_permission_group_settings(self.default_realm),
         }
         for key, value in defaults.items():
             kwargs[key] = kwargs.get(key, value)

zerver/lib/bulk_create.py

@@ -6,7 +6,10 @@ from django.utils.timezone import now as timezone_now
 
 from zerver.lib.create_user import create_user_profile, get_display_email_address
 from zerver.lib.initial_password import initial_password
-from zerver.lib.streams import get_default_group_setting_values, render_stream_description
+from zerver.lib.streams import (
+    get_default_values_for_stream_permission_group_settings,
+    render_stream_description,
+)
 from zerver.models import (
     NamedUserGroup,
     Realm,
@@ -221,7 +224,7 @@ def bulk_create_streams(realm: Realm, stream_dict: dict[str, dict[str, Any]]) ->
                     is_web_public=options.get("is_web_public", False),
                     is_in_zephyr_realm=realm.is_zephyr_mirror_realm,
                     creator=options.get("creator", None),
-                    **get_default_group_setting_values(realm),
+                    **get_default_values_for_stream_permission_group_settings(realm),
                 ),
             )
     # Sort streams by name before creating them so that we can have a

zerver/lib/streams.py

@@ -147,7 +147,7 @@ def get_stream_permission_default_group(
     return system_groups_name_dict[setting_default_name]
 
 
-def get_default_group_setting_values(realm: Realm) -> dict[str, UserGroup]:
+def get_default_values_for_stream_permission_group_settings(realm: Realm) -> dict[str, UserGroup]:
     group_setting_values = {}
     system_groups_name_dict = get_role_based_system_groups_dict(realm)
     for setting_name in Stream.stream_permission_group_settings:

zerver/lib/test_classes.py

@@ -60,8 +60,8 @@ from zerver.lib.soft_deactivation import do_soft_deactivate_users
 from zerver.lib.stream_subscription import get_subscribed_stream_ids_for_user
 from zerver.lib.streams import (
     create_stream_if_needed,
-    get_default_group_setting_values,
     get_default_value_for_history_public_to_subscribers,
+    get_default_values_for_stream_permission_group_settings,
 )
 from zerver.lib.subscription_info import gather_subscriptions
 from zerver.lib.test_console_output import (
@@ -1385,7 +1385,7 @@ Output:
                 invite_only=invite_only,
                 is_web_public=is_web_public,
                 history_public_to_subscribers=history_public_to_subscribers,
-                **get_default_group_setting_values(realm),
+                **get_default_values_for_stream_permission_group_settings(realm),
             )
         except IntegrityError:  # nocoverage -- this is for bugs in the tests
             raise Exception(