Closed ssinger closed 8 months ago
We don't want to call out to an API from inside the webhook, as that can create bad lockups if there are issues. So we either need to push it into a backup job. or simplify. I think we can go for just matching it on the amount instead of the id. The docs are unclear about what happens in the case there are multiple refunds, but how I interpret them it would only become a problem if there are multiple refunds issued to the same invoice before the webhook gets delivered, which I think is really unlikely.
To do that, what do you think of something like this:
diff --git a/postgresqleu/stripepayment/views.py b/postgresqleu/stripepayment/views.py
index 75b6327d..99418b42 100644
--- a/postgresqleu/stripepayment/views.py
+++ b/postgresqleu/stripepayment/views.py
@@ -166,47 +166,55 @@ def webhook(request, methodid):
return HttpResponse("OK")
elif payload['type'] == 'charge.refunded':
chargeid = payload['data']['object']['id']
-
- # There can be multiple refunds on each charge, so we have to look through all the
- # possible ones, and compare. Unfortunately, there is no notification available which
- # tells us *which one* was completed. Luckily there will never be *many* refunds on a
- # single charge.
- with transaction.atomic():
- for r in payload['data']['object']['refunds']['data']:
- try:
- refund = StripeRefund.objects.get(paymentmethod=method,
- chargeid=chargeid,
- refundid=r['id'])
- except StripeRefund.DoesNotExist:
- StripeLog(message="Received completed refund event for non-existant refund {}".format(r['id']),
- error=True,
- paymentmethod=method).save()
- return HttpResponse("OK")
- if refund.completedat:
- # It wasn't this one, as it's already been completed.
- continue
-
- if r['amount'] != refund.amount * 100:
- StripeLog(message="Received completed refund with amount {0} instead of expected {1} for refund {2}".format(r['amount'] / 100, refund.amount, refund.id),
- error=True,
- paymentmethod=method).save()
- return HttpResponse("OK")
-
- # OK, refund looks fine
- StripeLog(message="Received Stripe webhook for refund {}. Processing.".format(refund.id), paymentmethod=method).save()
-
- refund.completedat = timezone.now()
- refund.save()
-
- manager = InvoiceManager()
- manager.complete_refund(
- refund.invoicerefundid_id,
- refund.amount,
- 0, # Unknown fee
- pm.config('accounting_income'),
- pm.config('accounting_fee'),
- [],
- method)
+ amount = payload['data']['object']['amount_refunded']
+
+ # Stripe stopped including the refund id in the refund
+ # notification, and requires an extra API call to get
+ # it. Instead of doing that, since we have the charge id we
+ # can match it on that specific charge and the amount of the
+ # refund. This could potentially return multiple entries in
+ # case there is more than one refund made on the same charge
+ # before the webhook fires, but we'll just say that's unlikely
+ # enough we don't have to care about it.
+ try:
+ refund = StripeRefund.objects.get(
+ paymentmethod=method,
+ chargeid=chargeid,
+ amount=amount / 100,
+ )
+ except StripeRefund.DoesNotExist:
+ StripeLog(
+ message="Received completed refund event for charge {} with amount {} which could not be found in the database. Event has been acknowledged, but refund not marked as completed!",
+ error=True,
+ paymentmethod=method,
+ ).save()
+ return HttpResponse("OK")
+ except StripeRefund.MultipleObjectsReturned:
+ StripeLog(
+ message="Received completed refund event for charge {} with amount {} which matched multiple entries. Event has been acknowledged, but refund not marked as completed!",
+ error=True,
+ paymentmethod=method,
+ ).save()
+
+ if refund.completedat:
+ StripeLog(message="Received duplicate Stripe webhook for refund {}, ignoring.".format(refund.id), paymentmethod=method).save()
+ else:
+ # If it's not already processed, flag it as done and trigger the process.
+
+ StripeLog(message="Received Stripe webhook for refund {}. Processing.".format(refund.id), paymentmethod=method).save()
+
+ refund.completedat = timezone.now()
+ refund.save(update_fields=['completedat'])
+
+ manager = InvoiceManager()
+ manager.complete_refund(
+ refund.invoicerefundid_id,
+ refund.amount,
+ 0, # Unknown fee
+ pm.config('accounting_income'),
+ pm.config('accounting_fee'),
+ [],
+ method)
return HttpResponse("OK")
elif payload['type'] == 'payout.paid':
# Payout has left Stripe. Should include both automatic and manual ones
I think it's definitely simpler than trying to split the job in two and pull them down in the background?
Stripe API version 2022-11-15 no longer expands refunds automatically in the charge object. This means that the webhook payload doesn't include the refunds.
We call back to stripe to fetch a version of the charge object that includes them.
Fixes #156