refactor: Move SubInfo to stream_subscription.py.

This commit is contained in:
Steve Howell
2020-10-16 12:17:32 +00:00
committed by Tim Abbott
parent 16aa48d9b2
commit 73982f6cc9
2 changed files with 7 additions and 8 deletions

View File

@@ -4,7 +4,6 @@ import logging
import os import os
import time import time
from collections import defaultdict from collections import defaultdict
from dataclasses import dataclass
from operator import itemgetter from operator import itemgetter
from typing import ( from typing import (
AbstractSet, AbstractSet,
@@ -122,6 +121,7 @@ from zerver.lib.sessions import delete_user_sessions
from zerver.lib.storage import static_path from zerver.lib.storage import static_path
from zerver.lib.stream_recipient import StreamRecipientMap from zerver.lib.stream_recipient import StreamRecipientMap
from zerver.lib.stream_subscription import ( from zerver.lib.stream_subscription import (
SubInfo,
bulk_get_peers, bulk_get_peers,
bulk_get_subscriber_peer_info, bulk_get_subscriber_peer_info,
get_active_subscriptions_for_stream_id, get_active_subscriptions_for_stream_id,
@@ -234,13 +234,6 @@ from zerver.models import (
) )
from zerver.tornado.django_api import send_event from zerver.tornado.django_api import send_event
@dataclass
class SubInfo:
user: UserProfile
sub: Subscription
stream: Stream
if settings.BILLING_ENABLED: if settings.BILLING_ENABLED:
from corporate.lib.stripe import ( from corporate.lib.stripe import (
downgrade_now_without_creating_additional_invoices, downgrade_now_without_creating_additional_invoices,

View File

@@ -16,6 +16,12 @@ from zerver.models import (
) )
@dataclass
class SubInfo:
user: UserProfile
sub: Subscription
stream: Stream
@dataclass @dataclass
class SubscriberPeerInfo: class SubscriberPeerInfo:
subscribed_ids: Dict[int, Set[int]] subscribed_ids: Dict[int, Set[int]]