import: Move 'build_defaultstream' to import_util.

zerver/data_import/gitter.py

@@ -17,7 +17,7 @@ from zerver.models import Realm, UserProfile, Recipient
 from zerver.lib.export import MESSAGE_BATCH_CHUNK_SIZE
 from zerver.data_import.import_util import ZerverFieldsT, build_zerver_realm, \
     build_avatar, build_subscription, build_recipient, build_usermessages, \
-    process_avatars
+    build_defaultstream, process_avatars
 
 # stubs
 GitterDataT = List[Dict[str, Any]]
@@ -132,10 +132,7 @@ def build_stream(timestamp: Any) -> Tuple[List[ZerverFieldsT],
         date_created=timestamp,
         id=0)
 
-    defaultstream = dict(
-        stream=0,
-        realm=realm_id,
-        id=0)
+    defaultstream = build_defaultstream(realm_id=realm_id, stream_id=0, defaultstream_id=0)
     logging.info('######### IMPORTING STREAMS FINISHED #########\n')
     return [stream], [defaultstream]
 

zerver/data_import/import_util.py

@@ -79,6 +79,14 @@ def build_usermessages(zerver_usermessage: List[ZerverFieldsT], usermessage_id:
             zerver_usermessage.append(usermessage)
     return usermessage_id
 
+def build_defaultstream(realm_id: int, stream_id: int,
+                        defaultstream_id: int) -> ZerverFieldsT:
+    defaultstream = dict(
+        stream=stream_id,
+        realm=realm_id,
+        id=defaultstream_id)
+    return defaultstream
+
 def process_avatars(avatar_list: List[ZerverFieldsT], avatar_dir: str, realm_id: int,
                     threads: int, size_url_suffix: str='') -> List[ZerverFieldsT]:
     """

zerver/data_import/slack.py

@@ -22,7 +22,7 @@ from zerver.data_import.slack_message_conversion import convert_to_zulip_markdow
     get_user_full_name
 from zerver.data_import.import_util import ZerverFieldsT, build_zerver_realm, \
     build_avatar, build_subscription, build_recipient, build_usermessages, \
-    process_avatars, process_uploads, process_emojis
+    build_defaultstream, process_avatars, process_uploads, process_emojis
 from zerver.lib.parallel import run_parallel
 from zerver.lib.upload import random_name, sanitize_name
 from zerver.lib.export import MESSAGE_BATCH_CHUNK_SIZE
@@ -377,7 +377,7 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int, added_users: A
         # where every user is subscribed
         default_channels = ['general', 'random']  # Slack specific
         if channel['name'] in default_channels:
-            defaultstream = build_defaultstream(channel['name'], realm_id, stream_id,
+            defaultstream = build_defaultstream(realm_id, stream_id,
                                                 defaultstream_id)
             zerver_defaultstream.append(defaultstream)
             defaultstream_id += 1
@@ -432,14 +432,6 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int, added_users: A
     return zerver_defaultstream, zerver_stream, added_channels, zerver_subscription, \
         zerver_recipient, added_recipient
 
-def build_defaultstream(channel_name: str, realm_id: int, stream_id: int,
-                        defaultstream_id: int) -> ZerverFieldsT:
-    defaultstream = dict(
-        stream=stream_id,
-        realm=realm_id,
-        id=defaultstream_id)
-    return defaultstream
-
 def get_subscription(channel_members: List[str], zerver_subscription: List[ZerverFieldsT],
                      recipient_id: int, added_users: AddedUsersT,
                      subscription_id: int) -> int:

zerver/tests/test_slack_importer.py

@@ -11,7 +11,6 @@ from zerver.data_import.slack import (
     get_admin,
     get_user_timezone,
     users_to_zerver_userprofile,
-    build_defaultstream,
     get_subscription,
     channels_to_zerver_stream,
     slack_workspace_to_realm,
@@ -26,6 +25,7 @@ from zerver.data_import.import_util import (
     build_subscription,
     build_recipient,
     build_usermessages,
+    build_defaultstream,
 )
 from zerver.lib.import_realm import (
     do_import_realm,
@@ -212,10 +212,10 @@ class SlackImporter(ZulipTestCase):
     def test_build_defaultstream(self) -> None:
         realm_id = 1
         stream_id = 1
-        default_channel_general = build_defaultstream('general', realm_id, stream_id, 1)
+        default_channel_general = build_defaultstream(realm_id, stream_id, 1)
         test_default_channel = {'stream': 1, 'realm': 1, 'id': 1}
         self.assertDictEqual(test_default_channel, default_channel_general)
-        default_channel_general = build_defaultstream('random', realm_id, stream_id, 1)
+        default_channel_general = build_defaultstream(realm_id, stream_id, 1)
         test_default_channel = {'stream': 1, 'realm': 1, 'id': 1}
         self.assertDictEqual(test_default_channel, default_channel_general)