feat(billing): Remove AUTO_SEAT_UPGRADE_PLANS setting (#5343)

Author: khvn26

api/app/settings/common.py

@@ -1193,14 +1193,6 @@
 # hubspot without a Flagsmith organisation.
 CREATE_HUBSPOT_LEAD_WITHOUT_ORGANISATION_DELAY_MINUTES = 30
 
-# List of plan ids that support seat upgrades
-AUTO_SEAT_UPGRADE_PLANS = env.list(
-    "AUTO_SEAT_UPGRADE_PLANS",
-    subcast=str,
-    default=[],
-)
-
-
 SKIP_MIGRATION_TESTS = env.bool("SKIP_MIGRATION_TESTS", False)
 
 # prevent django-softdelete from performing whole table deletes!

api/conftest.py

@@ -1,3 +1,5 @@
+import importlib
+import inspect
 import logging
 import os
 import typing
@@ -19,6 +21,8 @@
 from flag_engine.segments.constants import EQUAL
 from moto import mock_dynamodb  # type: ignore[import-untyped]
 from mypy_boto3_dynamodb.service_resource import DynamoDBServiceResource, Table
+from pyfakefs.fake_filesystem import FakeFilesystem
+from pyfakefs.fake_filesystem_unittest import Patcher
 from pytest_django.fixtures import SettingsWrapper
 from pytest_django.plugin import blocking_manager_key
 from pytest_mock import MockerFixture
@@ -133,6 +137,24 @@ def pytest_configure(config: pytest.Config) -> None:
             )
 
 
+@pytest.fixture
+def fs() -> typing.Generator[FakeFilesystem | None, None, None]:
+    app_path = os.path.dirname(os.path.abspath(__file__))
+    real_paths = [app_path]
+
+    for module_name in (
+        "django",
+        "tzdata",
+    ):
+        module_file = inspect.getfile(importlib.import_module(module_name))
+        real_paths.append(os.path.dirname(os.path.abspath(module_file)))
+
+    with Patcher() as patcher:
+        if fs := patcher.fs:
+            fs.add_real_paths(real_paths)
+        yield fs
+
+
 @pytest.fixture(scope="session")
 def django_db_setup(request: pytest.FixtureRequest) -> None:
     if (

api/organisations/invites/views.py

@@ -151,8 +151,7 @@ def perform_create(self, serializer):  # type: ignore[no-untyped-def]
         subscription_metadata = organisation.subscription.get_subscription_metadata()
 
         if (
-            len(settings.AUTO_SEAT_UPGRADE_PLANS) > 0
-            and organisation.num_seats >= subscription_metadata.seats
+            organisation.num_seats >= subscription_metadata.seats
             and not organisation.subscription.can_auto_upgrade_seats
         ):
             raise SubscriptionDoesNotSupportSeatUpgrade()

api/organisations/models.py

@@ -138,10 +138,7 @@ def reset_alert_status(self):  # type: ignore[no-untyped-def]
         self.save()
 
     def is_auto_seat_upgrade_available(self) -> bool:
-        return (
-            len(settings.AUTO_SEAT_UPGRADE_PLANS) > 0
-            and self.subscription.can_auto_upgrade_seats
-        )
+        return self.subscription.can_auto_upgrade_seats
 
     @hook(BEFORE_DELETE)
     def cancel_subscription(self):  # type: ignore[no-untyped-def]
@@ -262,7 +259,10 @@ def update_plan(self, plan_id):  # type: ignore[no-untyped-def]
 
     @property
     def can_auto_upgrade_seats(self) -> bool:
-        return self.plan in settings.AUTO_SEAT_UPGRADE_PLANS
+        return (
+            is_saas()
+            and self.subscription_plan_family == SubscriptionPlanFamily.SCALE_UP
+        )
 
     @property
     def is_free_plan(self) -> bool:

api/tests/unit/organisations/invites/test_unit_invites_views.py

@@ -1,5 +1,4 @@
 import json
-import typing
 from datetime import timedelta
 
 import pytest
@@ -14,7 +13,7 @@
 
 from organisations.invites.models import Invite, InviteLink
 from organisations.models import Organisation, OrganisationRole, Subscription
-from users.models import FFAdminUser, HubspotTracker
+from users.models import FFAdminUser, HubspotTracker, UserPermissionGroup
 
 
 def test_create_invite_link(
@@ -184,13 +183,18 @@ def test_join_organisation_with_permission_groups(  # type: ignore[no-untyped-de
         invite.refresh_from_db()
 
 
-def test_create_invite_with_permission_groups(  # type: ignore[no-untyped-def]
-    admin_client, organisation, user_permission_group, admin_user, subscription
-):
+@pytest.mark.saas_mode
+def test_create_invite_with_permission_groups(
+    admin_client: APIClient,
+    organisation: Organisation,
+    user_permission_group: UserPermissionGroup,
+    admin_user: FFAdminUser,
+    chargebee_subscription: Subscription,
+) -> None:
     # Given
     # update subscription to add another seat
-    subscription.max_seats = 2
-    subscription.save()
+    chargebee_subscription.max_seats = 2
+    chargebee_subscription.save()
 
     url = reverse(
         "api-v1:organisations:organisation-invites-list",
@@ -204,23 +208,19 @@ def test_create_invite_with_permission_groups(  # type: ignore[no-untyped-def]
         url, data=json.dumps(data), content_type="application/json"
     )
     # Then
-    assert response.status_code == status.HTTP_201_CREATED
+    assert response.status_code == status.HTTP_201_CREATED, response.json()
     # and
     invite = Invite.objects.get(email=email)
     assert invite.permission_groups.first() == user_permission_group
     assert invite.invited_by == admin_user
 
 
-def test_create_invite_returns_400_if_seats_are_over(  # type: ignore[no-untyped-def]
-    admin_client,
-    organisation,
-    user_permission_group,
-    admin_user,
-    subscription,
-    settings,
-):
+def test_create_invite_returns_400_if_seats_are_over(
+    admin_client: APIClient,
+    organisation: Organisation,
+    user_permission_group: UserPermissionGroup,
+) -> None:
     # Given
-    settings.AUTO_SEAT_UPGRADE_PLANS = ["scale-up"]
     url = reverse(
         "api-v1:organisations:organisation-invites-list",
         args=[organisation.pk],
@@ -288,18 +288,14 @@ def test_update_invite_returns_405(  # type: ignore[no-untyped-def]
         (lazy_fixture("invite_link"), "api-v1:users:user-join-organisation-link"),
     ],
 )
-def test_join_organisation_returns_400_if_exceeds_plan_limit(  # type: ignore[no-untyped-def]
-    test_user_client,
-    organisation,
-    admin_user,
-    invite_object,
-    url,
-    subscription,
-    settings,
-):
+def test_join_organisation_returns_400_if_exceeds_plan_limit(
+    test_user_client: APIClient,
+    invite_object: Invite | InviteLink,
+    url: str,
+    settings: SettingsWrapper,
+) -> None:
     # Given
     settings.ENABLE_CHARGEBEE = True
-    settings.AUTO_SEAT_UPGRADE_PLANS = ["scale-up"]
     url = reverse(url, args=[invite_object.hash])
     # When
     response = test_user_client.post(url)
@@ -312,26 +308,24 @@ def test_join_organisation_returns_400_if_exceeds_plan_limit(  # type: ignore[no
     )
 
 
+@pytest.mark.saas_mode
 @pytest.mark.parametrize(
     "invite_object, url",
     [
         (lazy_fixture("invite"), "api-v1:users:user-join-organisation"),
         (lazy_fixture("invite_link"), "api-v1:users:user-join-organisation-link"),
     ],
 )
-def test_join_organisation_returns_400_if_payment_fails(  # type: ignore[no-untyped-def]
+def test_join_organisation_returns_400_if_payment_fails(
     test_user_client: APIClient,
-    organisation: Organisation,
-    admin_user: FFAdminUser,
-    invite_object: typing.Union[Invite, InviteLink],
+    invite_object: Invite | InviteLink,
     url: str,
     subscription: Subscription,
     settings: SettingsWrapper,
     mocker: MockerFixture,
-):
+) -> None:
     # Given
     settings.ENABLE_CHARGEBEE = True
-    settings.AUTO_SEAT_UPGRADE_PLANS = ["scale-up"]
 
     url = reverse(url, args=[invite_object.hash])
 

api/tests/unit/organisations/test_unit_organisations_models.py

@@ -168,11 +168,13 @@ def test_organisation_over_plan_seats_no_subscription(organisation, mocker, admi
     mocked_get_subscription_metadata.assert_not_called()
 
 
-def test_organisation_is_auto_seat_upgrade_available(organisation, settings):  # type: ignore[no-untyped-def]
+@pytest.mark.saas_mode
+def test_organisation_is_auto_seat_upgrade_available(
+    organisation: Organisation,
+) -> None:
     # Given
     plan = "Scale-Up"
     subscription_id = "subscription-id"
-    settings.AUTO_SEAT_UPGRADE_PLANS = [plan]
 
     Subscription.objects.filter(organisation=organisation).update(
         subscription_id=subscription_id, plan=plan
@@ -413,12 +415,11 @@ def test_organisation_get_subscription_metadata_for_self_hosted_open_source(
     assert subscription_metadata == FREE_PLAN_SUBSCRIPTION_METADATA
 
 
-def test_organisation_subscription_add_single_seat_calls_correct_chargebee_method_for_upgradable_plan(  # type: ignore[no-untyped-def]  # noqa: E501
-    mocker, settings
-):
+@pytest.mark.saas_mode
+def test_organisation_subscription_add_single_seat_calls_correct_chargebee_method_for_upgradable_plan(  # noqa: E501
+    mocker: MockerFixture,
+) -> None:
     # Given
-    settings.AUTO_SEAT_UPGRADE_PLANS = ["scale-up"]
-
     subscription_id = "subscription-id"
     subscription = Subscription(subscription_id=subscription_id, plan="scale-up")
 
@@ -432,12 +433,10 @@ def test_organisation_subscription_add_single_seat_calls_correct_chargebee_metho
     mocked_add_single_seat.assert_called_once_with(subscription_id)
 
 
-def test_organisation_subscription_add_single_seat_raises_error_for_non_upgradable_plan(  # type: ignore[no-untyped-def]  # noqa: E501
-    mocker, settings
-):
+def test_organisation_subscription_add_single_seat_raises_error_for_non_upgradable_plan(  # noqa: E501
+    mocker: MockerFixture,
+) -> None:
     # Given
-    settings.AUTO_SEAT_UPGRADE_PLANS = ["scale-up"]
-
     subscription_id = "subscription-id"
     subscription = Subscription(
         subscription_id=subscription_id, plan="not-a-scale-up-plan"

infrastructure/aws/production/ecs-task-definition-web.json

@@ -187,10 +187,6 @@
                     "name": "ENABLE_PIPEDRIVE_LEAD_TRACKING",
                     "value": "True"
                 },
-                {
-                    "name": "AUTO_SEAT_UPGRADE_PLANS",
-                    "value": "scale-up-12-months-v2-gbp,scale-up-12-months-v2-eur,scale-up-12-months-v2,scale-up-quarterly-v2-semiannual,scale-up-quarterly-v2,scale-up-v2,scale-up-24-months-v2"
-                },
                 {
                     "name": "PIPEDRIVE_IGNORE_DOMAINS",
                     "value": "flagsmith.com,solidstategroup.com,restmail.net,bullettrain.io,flagsmithe2etestdomain.io"
@@ -281,4 +277,4 @@
     ],
     "cpu": "1024",
     "memory": "2048"
-}
+}

infrastructure/aws/staging/ecs-task-definition-web.json

@@ -163,10 +163,6 @@
                     "name": "ENABLE_PIPEDRIVE_LEAD_TRACKING",
                     "value": "True"
                 },
-                {
-                    "name": "AUTO_SEAT_UPGRADE_PLANS",
-                    "value": "scale-up,scale-up-v2,scale-up-annual-v2,scale-up-24-months-v2"
-                },
                 {
                     "name": "USE_POSTGRES_FOR_ANALYTICS",
                     "value": "False"