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

slack: Rename added_recipient to slack_recipient_name_to_zulip_recipient_id.

This commit is contained in:
Vishnu KS 2019-08-13 13:32:03 +05:30 committed by Tim Abbott
parent 9d51a1b527
commit 01a51c8f4e
2 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
zerver/data_import/slack.py
View File

@ -32,7 +32,7 @@ SlackToZulipUserIDT = Dict[str, int]
AddedChannelsT = Dict[str, Tuple[str, int]]
AddedMPIMsT = Dict[str, Tuple[str, int]]
DMMembersT = Dict[str, Tuple[str, str]]
AddedRecipientsT = Dict[str, int]
SlackToZulipRecipientT = Dict[str, int]
def rm_tree(path: str) -> None:
if os.path.exists(path):
@ -42,7 +42,7 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze
realm_subdomain: str, slack_data_dir: str,
custom_emoji_list: ZerverFieldsT) -> Tuple[ZerverFieldsT,
SlackToZulipUserIDT,
AddedRecipientsT,
SlackToZulipRecipientT,
AddedChannelsT,
AddedMPIMsT,
DMMembersT,
@ -52,7 +52,8 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze
Returns:
1. realm, Converted Realm data
2. slack_user_id_to_zulip_user_id, which is a dictionary to map from slack user id to zulip user id
3. added_recipient, which is a dictionary to map from channel name to zulip recipient_id
3. slack_recipient_name_to_zulip_recipient_id, which is a dictionary to map from slack recipient
name(channel names, mpim names, usernames, etc) to zulip recipient id
4. added_channels, which is a dictionary to map from channel name to channel id, zulip stream_id
5. added_mpims, which is a dictionary to map from MPIM name to MPIM id, zulip huddle_id
6. dm_members, which is a dictionary to map from DM id to tuple of DM participants.
@ -67,9 +68,9 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze
zerver_userprofile, avatars, slack_user_id_to_zulip_user_id, zerver_customprofilefield, \
zerver_customprofilefield_value = users_to_zerver_userprofile(slack_data_dir, user_list,
realm_id, int(NOW), domain_name)
realm, added_channels, added_mpims, dm_members, \
added_recipient = channels_to_zerver_stream(slack_data_dir, realm_id, realm,
slack_user_id_to_zulip_user_id, zerver_userprofile)
realm, added_channels, added_mpims, dm_members, slack_recipient_name_to_zulip_recipient_id = \
channels_to_zerver_stream(slack_data_dir, realm_id, realm, slack_user_id_to_zulip_user_id,
zerver_userprofile)
zerver_realmemoji, emoji_url_map = build_realmemoji(custom_emoji_list, realm_id)
realm['zerver_realmemoji'] = zerver_realmemoji
@ -82,8 +83,8 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze
realm['zerver_customprofilefield'] = zerver_customprofilefield
realm['zerver_customprofilefieldvalue'] = zerver_customprofilefield_value
return realm, slack_user_id_to_zulip_user_id, added_recipient, added_channels, added_mpims, \
dm_members, avatars, emoji_url_map
return realm, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id, \
added_channels, added_mpims, dm_members, avatars, emoji_url_map
def build_realmemoji(custom_emoji_list: ZerverFieldsT,
realm_id: int) -> Tuple[List[ZerverFieldsT],
@ -328,21 +329,23 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
realm: Dict[str, Any],
slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
zerver_userprofile: List[ZerverFieldsT]) \
-> Tuple[Dict[str, List[ZerverFieldsT]], AddedChannelsT, AddedMPIMsT, DMMembersT, AddedRecipientsT]:
-> Tuple[Dict[str, List[ZerverFieldsT]], AddedChannelsT, AddedMPIMsT,
DMMembersT, SlackToZulipRecipientT]:
"""
Returns:
1. realm, Converted Realm data
2. added_channels, which is a dictionary to map from channel name to channel id, zulip stream_id
3. added_mpims, which is a dictionary to map from MPIM(multiparty IM) name to MPIM id, zulip huddle_id
4. dm_members, which is a dictionary to map from DM id to tuple of DM participants.
5. added_recipient, which is a dictionary to map from channel name to zulip recipient_id
5. slack_recipient_name_to_zulip_recipient_id, which is a dictionary to map from slack recipient
name(channel names, mpim names, usernames etc) to zulip recipient_id
"""
logging.info('######### IMPORTING CHANNELS STARTED #########\n')
added_channels = {}
added_mpims = {}
dm_members = {}
added_recipient = {}
slack_recipient_name_to_zulip_recipient_id = {}
realm["zerver_stream"] = []
realm["zerver_huddle"] = []
@ -389,7 +392,7 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
recipient = build_recipient(stream_id, recipient_id, Recipient.STREAM)
realm["zerver_recipient"].append(recipient)
added_recipient[stream['name']] = recipient_id
slack_recipient_name_to_zulip_recipient_id[stream['name']] = recipient_id
# TODO add recipients for private message and huddles
# construct the subscription object and append it to realm["zerver_subscription"]
@ -442,7 +445,7 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
recipient = build_recipient(huddle_id_count, recipient_id_count, Recipient.HUDDLE)
realm["zerver_recipient"].append(recipient)
added_recipient[mpim['name']] = recipient_id_count
slack_recipient_name_to_zulip_recipient_id[mpim['name']] = recipient_id_count
subscription_id_count = get_subscription(mpim['members'], realm["zerver_subscription"],
recipient_id_count, slack_user_id_to_zulip_user_id,
@ -460,7 +463,7 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
for slack_user_id, zulip_user_id in slack_user_id_to_zulip_user_id.items():
recipient = build_recipient(zulip_user_id, recipient_id_count, Recipient.PERSONAL)
added_recipient[slack_user_id] = recipient_id_count
slack_recipient_name_to_zulip_recipient_id[slack_user_id] = recipient_id_count
sub = build_subscription(recipient_id_count, zulip_user_id, subscription_id_count)
realm["zerver_recipient"].append(recipient)
realm["zerver_subscription"].append(sub)
@ -480,7 +483,7 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
process_dms(dms)
logging.info('######### IMPORTING STREAMS FINISHED #########\n')
return realm, added_channels, added_mpims, dm_members, added_recipient
return realm, added_channels, added_mpims, dm_members, slack_recipient_name_to_zulip_recipient_id
def get_subscription(channel_members: List[str], zerver_subscription: List[ZerverFieldsT],
recipient_id: int, slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
@ -548,7 +551,7 @@ def process_long_term_idle_users(slack_data_dir: str, users: List[ZerverFieldsT]
def convert_slack_workspace_messages(slack_data_dir: str, users: List[ZerverFieldsT], realm_id: int,
slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
added_recipient: AddedRecipientsT,
slack_recipient_name_to_zulip_recipient_id: SlackToZulipRecipientT,
added_channels: AddedChannelsT,
added_mpims: AddedMPIMsT,
dm_members: DMMembersT,
@ -598,8 +601,8 @@ def convert_slack_workspace_messages(slack_data_dir: str, users: List[ZerverFiel
zerver_message, zerver_usermessage, attachment, uploads, reactions = \
channel_message_to_zerver_message(
realm_id, users, slack_user_id_to_zulip_user_id, added_recipient, message_data,
zerver_realmemoji, subscriber_map, added_channels, dm_members,
realm_id, users, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id,
message_data, zerver_realmemoji, subscriber_map, added_channels, dm_members,
domain_name, long_term_idle)
message_json = dict(
@ -659,7 +662,7 @@ def get_messages_iterator(slack_data_dir: str, added_channels: Dict[str, Any],
def channel_message_to_zerver_message(realm_id: int,
users: List[ZerverFieldsT],
slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
added_recipient: AddedRecipientsT,
slack_recipient_name_to_zulip_recipient_id: SlackToZulipRecipientT,
all_messages: List[ZerverFieldsT],
zerver_realmemoji: List[ZerverFieldsT],
subscriber_map: Dict[int, Set[int]],
@ -721,20 +724,20 @@ def channel_message_to_zerver_message(realm_id: int,
if "channel_name" in message:
is_private = False
recipient_id = added_recipient[message['channel_name']]
recipient_id = slack_recipient_name_to_zulip_recipient_id[message['channel_name']]
elif "mpim_name" in message:
is_private = True
recipient_id = added_recipient[message['mpim_name']]
recipient_id = slack_recipient_name_to_zulip_recipient_id[message['mpim_name']]
elif "pm_name" in message:
is_private = True
sender = get_message_sending_user(message)
members = dm_members[message['pm_name']]
if sender == members[0]:
recipient_id = added_recipient[members[1]]
sender_recipient_id = added_recipient[members[0]]
recipient_id = slack_recipient_name_to_zulip_recipient_id[members[1]]
sender_recipient_id = slack_recipient_name_to_zulip_recipient_id[members[0]]
else:
recipient_id = added_recipient[members[0]]
sender_recipient_id = added_recipient[members[1]]
recipient_id = slack_recipient_name_to_zulip_recipient_id[members[0]]
sender_recipient_id = slack_recipient_name_to_zulip_recipient_id[members[1]]
message_id = NEXT_ID('message')
@ -1025,14 +1028,15 @@ def do_convert_data(slack_zip_file: str, output_dir: str, token: str, threads: i
# Get custom emoji from slack api
custom_emoji_list = get_slack_api_data("https://slack.com/api/emoji.list", "emoji", token=token)
realm, slack_user_id_to_zulip_user_id, added_recipient, added_channels, added_mpims, \
dm_members, avatar_list, emoji_url_map = slack_workspace_to_realm(domain_name, realm_id, user_list,
realm, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id, \
added_channels, added_mpims, dm_members, avatar_list, \
emoji_url_map = slack_workspace_to_realm(domain_name, realm_id, user_list,
realm_subdomain, slack_data_dir,
custom_emoji_list)
reactions, uploads_list, zerver_attachment = convert_slack_workspace_messages(
slack_data_dir, user_list, realm_id, slack_user_id_to_zulip_user_id,
added_recipient, added_channels, added_mpims, dm_members, realm,
slack_recipient_name_to_zulip_recipient_id, added_channels, added_mpims, dm_members, realm,
realm['zerver_userprofile'], realm['zerver_realmemoji'], domain_name, output_dir)
# Move zerver_reactions to realm.json file

33
zerver/tests/test_slack_importer.py
View File

@ -356,8 +356,8 @@ class SlackImporter(ZulipTestCase):
zerver_userprofile = [{'id': 1}, {'id': 8}, {'id': 7}, {'id': 5}]
realm_id = 3
realm, added_channels, added_mpims, dm_members, \
added_recipient = channels_to_zerver_stream(self.fixture_file_name("", "slack_fixtures"), realm_id,
realm, added_channels, added_mpims, dm_members, slack_recipient_name_to_zulip_recipient_id = \
channels_to_zerver_stream(self.fixture_file_name("", "slack_fixtures"), realm_id,
{"zerver_userpresence": []}, slack_user_id_to_zulip_user_id,
zerver_userprofile)
@ -368,7 +368,7 @@ class SlackImporter(ZulipTestCase):
'mpdm-user4--user1--user5-1': ('G6N944JPL', 2)}
test_dm_members = {'DJ47BL849': ('U061A1R2R', 'U061A5N1G'), 'DHX1UP7EG': ('U061A5N1G', 'U064KUGRJ'),
'DK8HSJDHS': ('U061A1R2R', 'U064KUGRJ'), 'DRS3PSLDK': ('U064KUGRJ', 'U064KUGRJ')}
test_added_recipient_keys = set(slack_user_id_to_zulip_user_id.keys()) | set(test_added_channels.keys()) \
slack_recipient_names = set(slack_user_id_to_zulip_user_id.keys()) | set(test_added_channels.keys()) \
| set(test_added_mpims.keys())
self.assertDictEqual(test_added_channels, added_channels)
@ -381,8 +381,8 @@ class SlackImporter(ZulipTestCase):
# We can't do an assertDictEqual since during the construction of Personal
# recipients, slack_user_id_to_zulip_user_id are iterated in diffrent order in Python 3.5 and 3.6.
self.assertEqual(set(added_recipient.keys()), test_added_recipient_keys)
self.assertEqual(set(added_recipient.values()), set(i for i in range(11)))
self.assertEqual(set(slack_recipient_name_to_zulip_recipient_id.keys()), slack_recipient_names)
self.assertEqual(set(slack_recipient_name_to_zulip_recipient_id.values()), set(i for i in range(11)))
# functioning of zerver subscriptions are already tested in the helper functions
# This is to check the concatenation of the output lists from the helper functions
@ -419,7 +419,7 @@ class SlackImporter(ZulipTestCase):
realm_id = 1
user_list = [] # type: List[Dict[str, Any]]
realm, slack_user_id_to_zulip_user_id, added_recipient, \
realm, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id, \
added_channels, added_mpims, dm_members, \
avatar_list, em = slack_workspace_to_realm('testdomain', realm_id, user_list, 'test-realm',
'./random_path', {})
@ -429,7 +429,7 @@ class SlackImporter(ZulipTestCase):
self.assertEqual(slack_user_id_to_zulip_user_id, {})
self.assertEqual(added_channels, {})
self.assertEqual(added_mpims, {})
self.assertEqual(added_recipient, {})
self.assertEqual(slack_recipient_name_to_zulip_recipient_id, {})
self.assertEqual(avatar_list, [])
mock_channels_to_zerver_stream.assert_called_once_with("./random_path", 1, ANY, {}, [])
@ -538,7 +538,7 @@ class SlackImporter(ZulipTestCase):
"text": "<@U061A5N1G>: Are you in Kochi?", "user": "U066MTL5U",
"ts": "1553607595.000700", "pm_name": "DJ47BL849"}] # type: List[Dict[str, Any]]
added_recipient = {'random': 2, 'general': 1, 'mpdm-user9--user2--user10-1': 5,
slack_recipient_name_to_zulip_recipient_id = {'random': 2, 'general': 1, 'mpdm-user9--user2--user10-1': 5,
'mpdm-user6--user7--user4-1': 6, 'U066MTL5U': 7, 'U061A5N1G': 8,
'U061A1R2R': 8}
dm_members = {'DJ47BL849': ('U066MTL5U', 'U061A5N1G'), 'DHX1UP7EG': ('U061A5N1G', 'U061A1R2R')}
@ -549,9 +549,8 @@ class SlackImporter(ZulipTestCase):
zerver_message, zerver_usermessage, attachment, uploads, reaction = \
channel_message_to_zerver_message(
1, user_data, slack_user_id_to_zulip_user_id, added_recipient,
all_messages, [], subscriber_map,
added_channels, dm_members, 'domain', set())
1, user_data, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id,
all_messages, [], subscriber_map, added_channels, dm_members, 'domain', set())
# functioning already tested in helper function
self.assertEqual(zerver_usermessage, [])
# subtype: channel_join is filtered
@ -574,13 +573,13 @@ class SlackImporter(ZulipTestCase):
self.assertEqual(zerver_message[3][EXPORT_TOPIC_NAME], 'imported from slack')
self.assertEqual(zerver_message[3]['content'], '/me added bot')
self.assertEqual(zerver_message[4]['recipient'], added_recipient['general'])
self.assertEqual(zerver_message[4]['recipient'], slack_recipient_name_to_zulip_recipient_id['general'])
self.assertEqual(zerver_message[2][EXPORT_TOPIC_NAME], 'imported from slack')
self.assertEqual(zerver_message[1]['recipient'], added_recipient['random'])
self.assertEqual(zerver_message[5]['recipient'], added_recipient['mpdm-user9--user2--user10-1'])
self.assertEqual(zerver_message[6]['recipient'], added_recipient['mpdm-user6--user7--user4-1'])
self.assertEqual(zerver_message[7]['recipient'], added_recipient['U061A5N1G'])
self.assertEqual(zerver_message[7]['recipient'], added_recipient['U061A5N1G'])
self.assertEqual(zerver_message[1]['recipient'], slack_recipient_name_to_zulip_recipient_id['random'])
self.assertEqual(zerver_message[5]['recipient'], slack_recipient_name_to_zulip_recipient_id['mpdm-user9--user2--user10-1'])
self.assertEqual(zerver_message[6]['recipient'], slack_recipient_name_to_zulip_recipient_id['mpdm-user6--user7--user4-1'])
self.assertEqual(zerver_message[7]['recipient'], slack_recipient_name_to_zulip_recipient_id['U061A5N1G'])
self.assertEqual(zerver_message[7]['recipient'], slack_recipient_name_to_zulip_recipient_id['U061A5N1G'])
self.assertEqual(zerver_message[3]['id'], zerver_message[0]['id'] + 3)
self.assertEqual(zerver_message[4]['id'], zerver_message[0]['id'] + 4)