An open source, non-profit web search engine
Handle locked subscriptions on tier change and take the tier from Polar
Claude1cde9c47375d
diff --git a/mwmbl/platform/api.py b/mwmbl/platform/api.pyindex f0f0c2f..3b5677a 100644--- a/mwmbl/platform/api.py+++ b/mwmbl/platform/api.py@@ -1484,7 +1484,10 @@ def change_membership(request, body: MembershipChangeRequest):)except polar_models.AlreadyCanceledSubscription:raise InvalidRequest("Membership has already ended.", status=409)- return _save_membership_update(user_membership, tier=body.tier, current_period_end=result.current_period_end)+ except polar_models.SubscriptionLocked:+ raise InvalidRequest("A change to this membership is already in progress. Try again shortly.", status=409)+ tier = membership.tier_for_product(result.product_id)+ return _save_membership_update(user_membership, tier=tier, current_period_end=result.current_period_end)def _save_membership_update(user_membership, **changes):diff --git a/test/test_membership.py b/test/test_membership.pyindex 5d75d33..03679f8 100644--- a/test/test_membership.py+++ b/test/test_membership.py@@ -18,7 +18,7 @@ from allauth.account.models import EmailAddressfrom django.contrib.auth import get_user_modelfrom django.test import Client, override_settingsfrom ninja_jwt.tokens import RefreshToken-from polar_sdk.models import AlreadyCanceledSubscription+from polar_sdk.models import AlreadyCanceledSubscription, SubscriptionLockedfrom mwmbl.membership import MembershipTierfrom mwmbl.models import Membership, UserBilling@@ -531,6 +531,77 @@ def test_change_membership_requires_verified_email(api_client, user):assert response.status_code == 403+@PRODUCT_SETTINGS+def test_change_membership_leaves_cancel_flag_alone(api_client, user):+ Membership.objects.create(user=user, tier=MembershipTier.SAPLING, polar_subscription_id="sub_member")++ response, _ = _post_change(+ api_client, user, "sprout", polar_update_result=_polar_subscription(product_id="prod_sprout")+ )++ assert response.status_code == 200+ assert response.json()["cancel_at_period_end"] is False+ assert Membership.objects.get(user=user).cancel_at_period_end is False+++@PRODUCT_SETTINGS+def test_change_membership_locked_in_polar_returns_409(api_client, user):+ Membership.objects.create(user=user, tier=MembershipTier.SAPLING, polar_subscription_id="sub_member")+ raw_response = Mock(status_code=409, text="Subscription is locked")+ locked_error = SubscriptionLocked(data=Mock(detail="Subscription is locked"), raw_response=raw_response)++ response, _ = _post_change(api_client, user, "canopy", polar_update_error=locked_error)++ assert response.status_code == 409+ assert Membership.objects.get(user=user).tier == MembershipTier.SAPLING+++@PRODUCT_SETTINGS+def test_change_membership_unknown_tier_is_rejected(api_client, user):+ Membership.objects.create(user=user, tier=MembershipTier.SAPLING, polar_subscription_id="sub_member")++ response, mock_polar = _post_change(api_client, user, "redwood")++ assert response.status_code == 422+ mock_polar.subscriptions.update.assert_not_called()+++@PRODUCT_SETTINGS+def test_change_membership_does_not_recreate_a_membership_deleted_during_the_polar_call(api_client, user):+ Membership.objects.create(user=user, tier=MembershipTier.SAPLING, polar_subscription_id="sub_member")++ def revoke_webhook_arrives(**kwargs):+ Membership.objects.filter(user=user).delete()+ return _polar_subscription(product_id="prod_canopy")++ response, _ = _post_change(api_client, user, "canopy", polar_update_error=revoke_webhook_arrives)++ assert response.status_code == 404+ assert not Membership.objects.filter(user=user).exists()+++@PRODUCT_SETTINGS+def test_change_membership_does_not_overwrite_a_subscription_changed_during_the_polar_call(api_client, user):+ Membership.objects.create(user=user, tier=MembershipTier.SAPLING, polar_subscription_id="sub_member")++ def new_subscription_webhook_arrives(**kwargs):+ Membership.objects.filter(user=user).update(tier=MembershipTier.SPROUT, polar_subscription_id="sub_new")+ return _polar_subscription(product_id="prod_canopy")++ response, _ = _post_change(api_client, user, "canopy", polar_update_error=new_subscription_webhook_arrives)++ assert response.status_code == 200+ assert response.json()["tier"] == "sprout"+ member = Membership.objects.get(user=user)+ assert member.polar_subscription_id == "sub_new"+ assert member.tier == MembershipTier.SPROUT++@pytest.mark.django_dbdef test_change_membership_unauthenticated(api_client):response = api_client.post(