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

zilencer: Make plan types less weird.

Browse Source
This commit is contained in:
Tim Abbott
2023-11-17 12:03:58 -08:00
parent c86ad857ac
commit c5940bd68f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
corporate/tests/test_stripe.py
View File

@@ -4429,7 +4429,7 @@ class BillingHelpersTest(ZulipTestCase):
) )
self.assertEqual(remote_server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_HOSTED) self.assertEqual(remote_server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_HOSTED)
do_change_remote_server_plan_type(remote_server, RemoteZulipServer.PLAN_TYPE_STANDARD) do_change_remote_server_plan_type(remote_server, RemoteZulipServer.PLAN_TYPE_BUSINESS)
remote_server = RemoteZulipServer.objects.get(uuid=server_uuid) remote_server = RemoteZulipServer.objects.get(uuid=server_uuid)
remote_realm_audit_log = RemoteZulipServerAuditLog.objects.filter( remote_realm_audit_log = RemoteZulipServerAuditLog.objects.filter(
@@ -4438,10 +4438,10 @@ class BillingHelpersTest(ZulipTestCase):
assert remote_realm_audit_log is not None assert remote_realm_audit_log is not None
expected_extra_data = { expected_extra_data = {
"old_value": RemoteZulipServer.PLAN_TYPE_SELF_HOSTED, "old_value": RemoteZulipServer.PLAN_TYPE_SELF_HOSTED,
"new_value": RemoteZulipServer.PLAN_TYPE_STANDARD, "new_value": RemoteZulipServer.PLAN_TYPE_BUSINESS,
} }
self.assertEqual(remote_realm_audit_log.extra_data, expected_extra_data) self.assertEqual(remote_realm_audit_log.extra_data, expected_extra_data)
self.assertEqual(remote_server.plan_type, RemoteZulipServer.PLAN_TYPE_STANDARD) self.assertEqual(remote_server.plan_type, RemoteZulipServer.PLAN_TYPE_BUSINESS)
def test_deactivate_remote_server(self) -> None: def test_deactivate_remote_server(self) -> None:
server_uuid = str(uuid.uuid4()) server_uuid = str(uuid.uuid4())

12
zilencer/models.py
View File

@@ -48,7 +48,9 @@ class RemoteZulipServer(models.Model):
# Plan types for self-hosted customers # Plan types for self-hosted customers
PLAN_TYPE_SELF_HOSTED = 1 PLAN_TYPE_SELF_HOSTED = 1
PLAN_TYPE_STANDARD = 102 PLAN_TYPE_COMMUNITY = 100
PLAN_TYPE_BUSINESS = 101
PLAN_TYPE_ENTERPRISE = 102
# The current billing plan for the remote server, similar to Realm.plan_type. # The current billing plan for the remote server, similar to Realm.plan_type.
plan_type = models.PositiveSmallIntegerField(default=PLAN_TYPE_SELF_HOSTED) plan_type = models.PositiveSmallIntegerField(default=PLAN_TYPE_SELF_HOSTED)
@@ -113,11 +115,17 @@ class RemoteRealm(models.Model):
# Plan types for self-hosted customers # Plan types for self-hosted customers
PLAN_TYPE_SELF_HOSTED = 1 PLAN_TYPE_SELF_HOSTED = 1
PLAN_TYPE_STANDARD = 102 PLAN_TYPE_COMMUNITY = 100
PLAN_TYPE_BUSINESS = 101
PLAN_TYPE_ENTERPRISE = 102
# The current billing plan for the remote server, similar to Realm.plan_type. # The current billing plan for the remote server, similar to Realm.plan_type.
plan_type = models.PositiveSmallIntegerField(default=PLAN_TYPE_SELF_HOSTED, db_index=True) plan_type = models.PositiveSmallIntegerField(default=PLAN_TYPE_SELF_HOSTED, db_index=True)
@override
def __str__(self) -> str:
return f"{self.host} {str(self.uuid)[0:12]}"
class RemoteZulipServerAuditLog(AbstractRealmAuditLog): class RemoteZulipServerAuditLog(AbstractRealmAuditLog):
"""Audit data associated with a remote Zulip server (not specific to a """Audit data associated with a remote Zulip server (not specific to a