paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

conversions: Use NEXT_ID for recipient and subscription ids.

Browse Source 
The NEXT_ID scheme seems pretty robust, so I'm fixing a
few easy places.
This commit is contained in:
Steve Howell
2018-10-23 19:58:51 +00:00
committed by showell
parent 50f76e58ce
commit 2ed9fbd25b
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/data_import/import_util.py
View File

@@ -10,6 +10,7 @@ from django.forms.models import model_to_dict
from zerver.models import Realm, RealmEmoji, Subscription, Recipient, \ from zerver.models import Realm, RealmEmoji, Subscription, Recipient, \
Attachment, Stream, Message, UserProfile Attachment, Stream, Message, UserProfile
from zerver.data_import.sequencer import NEXT_ID
from zerver.lib.actions import STREAM_ASSIGNMENT_COLORS as stream_colors from zerver.lib.actions import STREAM_ASSIGNMENT_COLORS as stream_colors
from zerver.lib.avatar_hash import user_avatar_path_from_ids from zerver.lib.avatar_hash import user_avatar_path_from_ids
from zerver.lib.parallel import run_parallel from zerver.lib.parallel import run_parallel
@@ -133,17 +134,14 @@ def build_subscriptions(
for user in zerver_userprofile for user in zerver_userprofile
] ]
subscription_id = 1
for recipient_id in public_stream_recipient_ids: for recipient_id in public_stream_recipient_ids:
for user_id in user_ids: for user_id in user_ids:
subscription = build_subscription( subscription = build_subscription(
recipient_id=recipient_id, recipient_id=recipient_id,
user_id=user_id, user_id=user_id,
subscription_id=subscription_id, subscription_id=NEXT_ID('subscription'),
) )
subscriptions.append(subscription) subscriptions.append(subscription)
subscription_id += 1
personal_recipients = [ personal_recipients = [
recipient recipient
@@ -157,10 +155,9 @@ def build_subscriptions(
subscription = build_subscription( subscription = build_subscription(
recipient_id=recipient_id, recipient_id=recipient_id,
user_id=user_id, user_id=user_id,
subscription_id=subscription_id, subscription_id=NEXT_ID('subscription'),
) )
subscriptions.append(subscription) subscriptions.append(subscription)
subscription_id += 1
return subscriptions return subscriptions
@@ -180,7 +177,6 @@ def build_recipients(zerver_userprofile: List[ZerverFieldsT],
tightly integrated with creating other objects. tightly integrated with creating other objects.
''' '''
recipient_id = 1
recipients = [] recipients = []
for user in zerver_userprofile: for user in zerver_userprofile:
@@ -188,24 +184,22 @@ def build_recipients(zerver_userprofile: List[ZerverFieldsT],
type = Recipient.PERSONAL type = Recipient.PERSONAL
recipient = Recipient( recipient = Recipient(
type_id=type_id, type_id=type_id,
id=recipient_id, id=NEXT_ID('recipient'),
type=type, type=type,
) )
recipient_dict = model_to_dict(recipient) recipient_dict = model_to_dict(recipient)
recipients.append(recipient_dict) recipients.append(recipient_dict)
recipient_id += 1
for stream in zerver_stream: for stream in zerver_stream:
type_id = stream['id'] type_id = stream['id']
type = Recipient.STREAM type = Recipient.STREAM
recipient = Recipient( recipient = Recipient(
type_id=type_id, type_id=type_id,
id=recipient_id, id=NEXT_ID('recipient'),
type=type, type=type,
) )
recipient_dict = model_to_dict(recipient) recipient_dict = model_to_dict(recipient)
recipients.append(recipient_dict) recipients.append(recipient_dict)
recipient_id += 1
return recipients return recipients