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

zilencer: Don't migrate plans with sponsorship pending.

This commit is contained in:
Tim Abbott 2024-01-04 16:58:52 -08:00
parent 219df72d07
commit 2436df6fa6
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
corporate/tests/test_remote_billing.py
View File

@ -488,6 +488,11 @@ class RemoteBillingAuthenticationTest(RemoteRealmBillingTestCase):
# Delete any existing remote realms. # Delete any existing remote realms.
RemoteRealm.objects.all().delete() RemoteRealm.objects.all().delete()
# First, set a sponsorship as pending.
# TODO: Ideally, we'd submit a proper sponsorship request.
server_customer.sponsorship_pending = True
server_customer.save()
# Send server data to push bouncer. # Send server data to push bouncer.
self.add_mock_response() self.add_mock_response()
send_server_data_to_push_bouncer(consider_usage_statistics=False) send_server_data_to_push_bouncer(consider_usage_statistics=False)
@ -495,6 +500,18 @@ class RemoteBillingAuthenticationTest(RemoteRealmBillingTestCase):
# RemoteRealm objects should be created for all realms on the server. # RemoteRealm objects should be created for all realms on the server.
self.assert_length(RemoteRealm.objects.all(), 4) self.assert_length(RemoteRealm.objects.all(), 4)
# Server's plan should not have been migrated yet.
self.server.refresh_from_db()
self.assertEqual(self.server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_MANAGED_LEGACY)
# Now clear sponsorship_pending.
# TODO: Ideally, this would approve the sponsorship.
server_customer.sponsorship_pending = False
server_customer.save()
# Send server data to push bouncer again.
send_server_data_to_push_bouncer(consider_usage_statistics=False)
# Server plan status was reset # Server plan status was reset
self.server.refresh_from_db() self.server.refresh_from_db()
self.assertEqual(self.server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_MANAGED) self.assertEqual(self.server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_MANAGED)

9
zilencer/views.py
View File

@ -847,6 +847,15 @@ def handle_customer_migration_from_server_to_realms(
if server_customer is None: if server_customer is None:
return return
if server_customer.sponsorship_pending:
# If we have a pending sponsorship request, defer moving any
# data until the sponsorship request has been processed. This
# avoids a race where a sponsorship request made at the server
# level gets approved after the legacy plan has already been
# moved to the sole human RemoteRealm, which would violate
# invariants.
return
server_plan = get_current_plan_by_customer(server_customer) server_plan = get_current_plan_by_customer(server_customer)
if server_plan is None: if server_plan is None:
# If the server has no current plan, either because it never # If the server has no current plan, either because it never