Skip to content

armgit / mwmbl

Public Imported from GitHub
0

An open source, non-profit web search engine

Route Polar subscription events on the usage product, not membership tiers

Claudeaddc473bf037
diff --git a/mwmbl/platform/api.py b/mwmbl/platform/api.py
index 1849ac9..79514b7 100644
--- a/mwmbl/platform/api.py
+++ b/mwmbl/platform/api.py
@@ -1380,6 +1380,13 @@ def _sync_membership(subscription):
logger.warning("Polar webhook: no user found for membership user_id=%s", user_id)
return
+ if membership.tier_for_product(subscription.product_id) is None:
+ logger.warning(
+ "Polar webhook: subscription id=%s is for product id=%s, which isn't a current membership tier",
+ subscription.id,
+ subscription.product_id,
+ )
+
live_subscriptions = _live_membership_subscriptions(user)
if not live_subscriptions:
deleted, _ = Membership.objects.filter(user=user).delete()
@@ -1524,7 +1531,9 @@ def polar_webhook(request):
event_type = event.TYPE
logger.info("Polar webhook event type=%s", event_type)
- if event_type.startswith("subscription.") and membership.tier_for_product(event.data.product_id):
+ # Route on the usage product, which is fixed, rather than on the membership products, which can
+ # change: a subscription to a retired membership product must never be mistaken for usage billing.
+ if event_type.startswith("subscription.") and event.data.product_id != settings.POLAR_PRODUCT_ID_USAGE:
_sync_membership(event.data)
elif event_type in ("subscription.active", "subscription.updated", "subscription.uncanceled"):
user_id = event.data.metadata.get("user_id")
diff --git a/test/test_membership.py b/test/test_membership.py
index 58817a9..8fe6637 100644
--- a/test/test_membership.py
+++ b/test/test_membership.py
@@ -23,6 +23,7 @@ from mwmbl.models import Membership, UserBilling
User = get_user_model()
PRODUCT_SETTINGS = override_settings(
+ POLAR_PRODUCT_ID_USAGE="prod_usage",
POLAR_PRODUCT_ID_SPROUT="prod_sprout",
POLAR_PRODUCT_ID_SAPLING="prod_sapling",
POLAR_PRODUCT_ID_CANOPY="prod_canopy",
@@ -380,3 +381,18 @@ def test_webhook_past_due_keeps_membership_and_join_date(api_client, user):
assert Membership.objects.get(user=user).started == member.started
assert "past_due" in mock_polar.subscriptions.list.call_args[1]["status"]
+
+
+@PRODUCT_SETTINGS
+def test_webhook_retired_product_is_not_treated_as_usage_billing(api_client, user):
+ UserBilling.objects.create(user=user, polar_subscription_id="sub_usage", max_monthly_spend_cents=1_000)
+ Membership.objects.create(user=user, tier=MembershipTier.SPROUT, polar_subscription_id="sub_member")
+ event = _membership_event("subscription.revoked", user.id, product_id="prod_retired", status="canceled")
+
+ _post_webhook(api_client, event, [])
+
+ billing = UserBilling.objects.get(user=user)
+ assert billing.polar_subscription_id == "sub_usage"
+ assert billing.max_monthly_spend_cents == 1_000
+ assert not Membership.objects.filter(user=user).exists()
diff --git a/test/test_platform_billing.py b/test/test_platform_billing.py
index e80470a..151c5e3 100644
--- a/test/test_platform_billing.py
+++ b/test/test_platform_billing.py
@@ -14,7 +14,7 @@ from unittest.mock import patch
import pytest
from allauth.account.models import EmailAddress
from django.contrib.auth import get_user_model
-from django.test import Client
+from django.test import Client, override_settings
from ninja_jwt.tokens import RefreshToken
from mwmbl.models import AgreementType, UserAgreement, UserBilling
@@ -349,6 +349,7 @@ def _mock_webhook_event(event_type, user_id, **data_overrides):
event.TYPE = event_type
event.data = Mock()
event.data.metadata = {"user_id": str(user_id)}
+ event.data.product_id = "prod_usage"
event.data.customer_id = data_overrides.get("customer_id", "cust_new")
event.data.id = data_overrides.get("subscription_id", "sub_new")
event.data.current_period_end = data_overrides.get("current_period_end", None)
@@ -357,6 +358,7 @@ def _mock_webhook_event(event_type, user_id, **data_overrides):
@pytest.mark.django_db
+@override_settings(POLAR_PRODUCT_ID_USAGE="prod_usage")
def test_webhook_subscription_active_sets_billing_fields_not_spend_limit(api_client, verified_user_with_billing):
billing = UserBilling.objects.get(user=verified_user_with_billing)
billing.max_monthly_spend_cents = 2_500
@@ -381,6 +383,7 @@ def test_webhook_subscription_active_sets_billing_fields_not_spend_limit(api_cli
@pytest.mark.django_db
+@override_settings(POLAR_PRODUCT_ID_USAGE="prod_usage")
def test_webhook_subscription_canceled_immediate_resets_spend_limit_to_zero(api_client, verified_user_with_billing):
billing = UserBilling.objects.get(user=verified_user_with_billing)
assert billing.max_monthly_spend_cents == 1_000
@@ -400,6 +403,7 @@ def test_webhook_subscription_canceled_immediate_resets_spend_limit_to_zero(api_
@pytest.mark.django_db
+@override_settings(POLAR_PRODUCT_ID_USAGE="prod_usage")
def test_webhook_subscription_canceled_scheduled_does_not_reset_spend_limit(api_client, verified_user_with_billing):
event = _mock_webhook_event("subscription.canceled", verified_user_with_billing.id, cancel_at_period_end=True)
with patch("mwmbl.platform.api.validate_event", return_value=event):
@@ -416,6 +420,7 @@ def test_webhook_subscription_canceled_scheduled_does_not_reset_spend_limit(api_
@pytest.mark.django_db
+@override_settings(POLAR_PRODUCT_ID_USAGE="prod_usage")
def test_webhook_subscription_revoked_resets_spend_limit_to_zero(api_client, verified_user_with_billing):
event = _mock_webhook_event("subscription.revoked", verified_user_with_billing.id)
with patch("mwmbl.platform.api.validate_event", return_value=event):