Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

fix: Account for Multiple Owners being returned when handling stripe payment intent webhook #1146

Merged
merged 2 commits into from
Feb 8, 2025
Merged

fix: Account for Multiple Owners being returned when handling stripe payment intent webhook #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4967464
update logic to support multiple subscriptions
ajay-sentry Feb 7, 2025
bc7dd08
fix and update tests
ajay-sentry Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 126 additions & 0 deletions billing/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,6 +1643,132 @@ class MockPaymentMethod:
"sub_123", default_payment_method=payment_method_retrieve_mock.return_value
)

@patch("logging.Logger.error")
@patch("services.billing.stripe.PaymentMethod.attach")
@patch("services.billing.stripe.Customer.modify")
@patch("services.billing.stripe.Subscription.modify")
@patch("services.billing.stripe.PaymentMethod.retrieve")
def test_check_and_handle_delayed_notification_payment_methods_no_subscription(
self,
payment_method_retrieve_mock,
subscription_modify_mock,
customer_modify_mock,
payment_method_attach_mock,
log_error_mock,
):
class MockPaymentMethod:
type = "us_bank_account"
us_bank_account = {}
id = "pm_123"

payment_method_retrieve_mock.return_value = MockPaymentMethod()

self.owner.stripe_subscription_id = None
self.owner.stripe_customer_id = "cus_123"
self.owner.save()

handler = StripeWebhookHandler()
handler._check_and_handle_delayed_notification_payment_methods(
"cus_123", "pm_123"
)

payment_method_retrieve_mock.assert_called_once_with("pm_123")
payment_method_attach_mock.assert_not_called()
customer_modify_mock.assert_not_called()
subscription_modify_mock.assert_not_called()

log_error_mock.assert_called_once_with(
"No owners found with that customer_id, something went wrong",
extra=dict(customer_id="cus_123"),
)

@patch("logging.Logger.error")
@patch("services.billing.stripe.PaymentMethod.attach")
@patch("services.billing.stripe.Customer.modify")
@patch("services.billing.stripe.Subscription.modify")
@patch("services.billing.stripe.PaymentMethod.retrieve")
def test_check_and_handle_delayed_notification_payment_methods_no_customer(
self,
payment_method_retrieve_mock,
subscription_modify_mock,
customer_modify_mock,
payment_method_attach_mock,
log_error_mock,
):
class MockPaymentMethod:
type = "us_bank_account"
us_bank_account = {}
id = "pm_123"

payment_method_retrieve_mock.return_value = MockPaymentMethod()

handler = StripeWebhookHandler()
handler._check_and_handle_delayed_notification_payment_methods(
"cus_1", "pm_123"
)

payment_method_retrieve_mock.assert_called_once_with("pm_123")
payment_method_attach_mock.assert_not_called()
customer_modify_mock.assert_not_called()
subscription_modify_mock.assert_not_called()

log_error_mock.assert_called_once_with(
"No owners found with that customer_id, something went wrong",
extra=dict(customer_id="cus_1"),
)

@patch("services.billing.stripe.PaymentMethod.attach")
@patch("services.billing.stripe.Customer.modify")
@patch("services.billing.stripe.Subscription.modify")
@patch("services.billing.stripe.PaymentMethod.retrieve")
def test_check_and_handle_delayed_notification_payment_methods_multiple_subscriptions(
self,
payment_method_retrieve_mock,
subscription_modify_mock,
customer_modify_mock,
payment_method_attach_mock,
):
class MockPaymentMethod:
type = "us_bank_account"
us_bank_account = {}
id = "pm_123"

payment_method_retrieve_mock.return_value = MockPaymentMethod()

self.owner.stripe_subscription_id = "sub_123"
self.owner.stripe_customer_id = "cus_123"
self.owner.save()

OwnerFactory(stripe_subscription_id="sub_124", stripe_customer_id="cus_123")

handler = StripeWebhookHandler()
handler._check_and_handle_delayed_notification_payment_methods(
"cus_123", "pm_123"
)

payment_method_retrieve_mock.assert_called_once_with("pm_123")
payment_method_attach_mock.assert_called_once_with(
payment_method_retrieve_mock.return_value, customer="cus_123"
)
customer_modify_mock.assert_called_once_with(
"cus_123",
invoice_settings={
"default_payment_method": payment_method_retrieve_mock.return_value
},
)
subscription_modify_mock.assert_has_calls(
[
call(
"sub_123",
default_payment_method=payment_method_retrieve_mock.return_value,
),
call(
"sub_124",
default_payment_method=payment_method_retrieve_mock.return_value,
),
]
)

@patch(
"billing.views.StripeWebhookHandler._check_and_handle_delayed_notification_payment_methods"
)
Expand Down
36 changes: 25 additions & 11 deletions billing/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,6 @@ def _check_and_handle_delayed_notification_payment_methods(
When verification succeeds, this attaches the payment method to the customer and sets
it as the default payment method for both the customer and subscription.
"""
owner = Owner.objects.get(stripe_customer_id=customer_id)
payment_method = stripe.PaymentMethod.retrieve(payment_method_id)

is_us_bank_account = payment_method.type == "us_bank_account" and hasattr(
Expand All @@ -548,19 +547,34 @@ def _check_and_handle_delayed_notification_payment_methods(

should_set_as_default = is_us_bank_account

# attach the payment method + set as default on the invoice and subscription
if should_set_as_default:
# attach the payment method + set as default on the invoice and subscription
stripe.PaymentMethod.attach(
payment_method, customer=owner.stripe_customer_id
)
stripe.Customer.modify(
owner.stripe_customer_id,
invoice_settings={"default_payment_method": payment_method},
)
stripe.Subscription.modify(
owner.stripe_subscription_id, default_payment_method=payment_method
# retrieve the number of owners to update
owners = Owner.objects.filter(
stripe_customer_id=customer_id, stripe_subscription_id__isnull=False
Copy link
Contributor

@suejung-sentry suejung-sentry Feb 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, i like adding the filter for not null

)

if owners.exists():
# Even if multiple results are returned, these two stripe calls are
# just for a single customer
stripe.PaymentMethod.attach(payment_method, customer=customer_id)
stripe.Customer.modify(
customer_id,
invoice_settings={"default_payment_method": payment_method},
)

# But this one is for each subscription an owner may have
for owner in owners:
stripe.Subscription.modify(
owner.stripe_subscription_id,
default_payment_method=payment_method,
)
else:
log.error(
"No owners found with that customer_id, something went wrong",
extra=dict(customer_id=customer_id),
)

def payment_intent_succeeded(self, payment_intent: stripe.PaymentIntent) -> None:
"""
Stripe payment_intent.succeeded webhook event is emitted when a
Expand Down
Loading