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

corporate: Make BillingSession alias for latest seat count. 

Creates `current_count_for_billed_licenses` as an abstract method
in BillingSession class, to get the latest seat count for the realm
(and eventually remote server) connected to the customer.
This commit is contained in:
Lauryn Menard 2023-11-08 17:02:31 +01:00 committed by Tim Abbott
parent c597de6a1d
commit 26ad2e29c6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
corporate/lib/stripe.py
View File

@ -361,6 +361,10 @@ class BillingSession(ABC):
def get_customer(self) -> Optional[Customer]: def get_customer(self) -> Optional[Customer]:
pass pass
@abstractmethod
def current_count_for_billed_licenses(self) -> int:
pass
@abstractmethod @abstractmethod
def get_audit_log_event(self, event_type: AuditLogEventType) -> int: def get_audit_log_event(self, event_type: AuditLogEventType) -> int:
pass pass
@ -617,6 +621,10 @@ class RealmBillingSession(BillingSession):
def get_customer(self) -> Optional[Customer]: def get_customer(self) -> Optional[Customer]:
return get_customer_by_realm(self.realm) return get_customer_by_realm(self.realm)
@override
def current_count_for_billed_licenses(self) -> int:
return get_latest_seat_count(self.realm)
@override @override
def get_audit_log_event(self, event_type: AuditLogEventType) -> int: def get_audit_log_event(self, event_type: AuditLogEventType) -> int:
if event_type is AuditLogEventType.STRIPE_CUSTOMER_CREATED: if event_type is AuditLogEventType.STRIPE_CUSTOMER_CREATED:
@ -1064,7 +1072,8 @@ def process_initial_upgrade(
else: else:
# billed_licenses can be greater than licenses if users are added between the start of # billed_licenses can be greater than licenses if users are added between the start of
# this function (process_initial_upgrade) and now # this function (process_initial_upgrade) and now
billed_licenses = max(get_latest_seat_count(customer.realm), licenses) current_licenses_count = billing_session.current_count_for_billed_licenses()
billed_licenses = max(current_licenses_count, licenses)
plan_params = { plan_params = {
"automanage_licenses": automanage_licenses, "automanage_licenses": automanage_licenses,
"charge_automatically": charge_automatically, "charge_automatically": charge_automatically,