Update stripe payment handling

Author: daveearley

backend/app/Http/Actions/Common/Webhooks/StripeIncomingWebhookAction.php

@@ -12,20 +12,24 @@
 
 class StripeIncomingWebhookAction extends BaseAction
 {
-    private IncomingWebhookHandler $webhookHandler;
-
-    public function __construct(IncomingWebhookHandler $webhookHandler)
-    {
-        $this->webhookHandler = $webhookHandler;
-    }
-
     public function __invoke(Request $request): Response
     {
         try {
-            $this->webhookHandler->handle(new StripeWebhookDTO(
-                headerSignature: $request->server('HTTP_STRIPE_SIGNATURE'),
-                payload: $request->getContent(),
-            ));
+            $headerSignature = $request->server('HTTP_STRIPE_SIGNATURE');
+            $payload = $request->getContent();
+
+            dispatch(static function (IncomingWebhookHandler $handler) use ($headerSignature, $payload) {
+                $handler->handle(new StripeWebhookDTO(
+                    headerSignature: $headerSignature,
+                    payload: $payload,
+                ));
+            })->catch(function (Throwable $exception) use ($payload) {
+                logger()->error(__('Failed to handle incoming Stripe webhook'), [
+                    'exception' => $exception,
+                    'payload' => $payload,
+                ]);
+            });
+
         } catch (Throwable $exception) {
             logger()?->error($exception->getMessage(), $exception->getTrace());
             return $this->noContentResponse(ResponseCodes::HTTP_BAD_REQUEST);

backend/app/Services/Application/Handlers/Order/Payment/Stripe/CreatePaymentIntentHandler.php

@@ -20,6 +20,8 @@
 use HiEvents\Services\Domain\Payment\Stripe\DTOs\CreatePaymentIntentResponseDTO;
 use HiEvents\Services\Domain\Payment\Stripe\StripePaymentIntentCreationService;
 use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
+use Stripe\Exception\ApiErrorException;
+use Throwable;
 
 readonly class CreatePaymentIntentHandler
 {
@@ -34,11 +36,15 @@ public function __construct(
     }
 
     /**
+     * @param string $orderShortId
+     * @return CreatePaymentIntentResponseDTO
+     * @throws CreatePaymentIntentFailedException
      * @throws MathException
      * @throws NumberFormatException
      * @throws RoundingNecessaryException
      * @throws UnknownCurrencyException
-     * @throws CreatePaymentIntentFailedException
+     * @throws ApiErrorException
+     * @throws Throwable
      */
     public function handle(string $orderShortId): CreatePaymentIntentResponseDTO
     {

backend/app/Services/Application/Handlers/Order/Payment/Stripe/IncomingWebhookHandler.php

@@ -8,6 +8,7 @@
 use HiEvents\Services\Domain\Payment\Stripe\EventHandlers\ChargeRefundUpdatedHandler;
 use HiEvents\Services\Domain\Payment\Stripe\EventHandlers\PaymentIntentFailedHandler;
 use HiEvents\Services\Domain\Payment\Stripe\EventHandlers\PaymentIntentSucceededHandler;
+use Illuminate\Cache\Repository;
 use Illuminate\Log\Logger;
 use JsonException;
 use Stripe\Event;
@@ -16,14 +17,15 @@
 use Throwable;
 use UnexpectedValueException;
 
-readonly class IncomingWebhookHandler
+class IncomingWebhookHandler
 {
     public function __construct(
-        private ChargeRefundUpdatedHandler    $refundEventHandlerService,
-        private PaymentIntentSucceededHandler $paymentIntentSucceededHandler,
-        private PaymentIntentFailedHandler    $paymentIntentFailedHandler,
-        private AccountUpdateHandler          $accountUpdateHandler,
-        private Logger                        $logger
+        private readonly ChargeRefundUpdatedHandler    $refundEventHandlerService,
+        private readonly PaymentIntentSucceededHandler $paymentIntentSucceededHandler,
+        private readonly PaymentIntentFailedHandler    $paymentIntentFailedHandler,
+        private readonly AccountUpdateHandler          $accountUpdateHandler,
+        private readonly Logger                        $logger,
+        private readonly Repository                    $cache,
     )
     {
     }
@@ -42,6 +44,16 @@ public function handle(StripeWebhookDTO $webhookDTO): void
                 config('services.stripe.webhook_secret'),
             );
 
+            if ($this->hasEventBeenHandled($event)) {
+                $this->logger->debug('Stripe event already handled', [
+                    'event_id' => $event->id,
+                    'type' => $event->type,
+                    'data' => $event->data->object->toArray(),
+                ]);
+
+                return;
+            }
+
             $this->logger->debug('Stripe event received', $event->data->object->toArray());
 
             switch ($event->type) {
@@ -60,6 +72,8 @@ public function handle(StripeWebhookDTO $webhookDTO): void
                 default:
                     $this->logger->debug(sprintf('Unhandled Stripe webhook: %s', $event->type));
             }
+
+            $this->markEventAsHandled($event);
         } catch (CannotAcceptPaymentException $exception) {
             $this->logger->error(
                 'Cannot accept payment: ' . $exception->getMessage(), [
@@ -88,4 +102,14 @@ public function handle(StripeWebhookDTO $webhookDTO): void
             throw $exception;
         }
     }
+
+    private function hasEventBeenHandled(Event $event): bool
+    {
+        return $this->cache->has('stripe_event_' . $event->id);
+    }
+
+    private function markEventAsHandled(Event $event): void
+    {
+        $this->cache->put('stripe_event_' . $event->id, true, now()->addMinutes(60));
+    }
 }

backend/app/Services/Application/Handlers/Order/Payment/Stripe/RefundOrderHandler.php

@@ -126,15 +126,15 @@ private function refundOrder(RefundOrderDTO $refundOrderDTO): OrderDomainObject
             $this->orderCancelService->cancelOrder($order);
         }
 
-        if ($refundOrderDTO->notify_buyer) {
-            $this->notifyBuyer($order, $event, $amount);
-        }
-
         $this->refundService->refundPayment(
             amount: $amount,
             payment: $order->getStripePayment()
         );
 
+        if ($refundOrderDTO->notify_buyer) {
+            $this->notifyBuyer($order, $event, $amount);
+        }
+
         return $this->markOrderRefundPending($order);
     }
 }

backend/app/Services/Domain/Payment/Stripe/EventHandlers/ChargeRefundUpdatedHandler.php

@@ -15,15 +15,14 @@
 use Stripe\Refund;
 use Throwable;
 
-readonly class ChargeRefundUpdatedHandler
+class ChargeRefundUpdatedHandler
 {
     public function __construct(
-        private OrderRepositoryInterface          $orderRepository,
-        private StripePaymentsRepositoryInterface $stripePaymentsRepository,
-        private Logger                            $logger,
-        private DatabaseManager                   $databaseManager,
-        private EventStatisticsUpdateService      $eventStatisticsUpdateService,
-
+        private readonly OrderRepositoryInterface          $orderRepository,
+        private readonly StripePaymentsRepositoryInterface $stripePaymentsRepository,
+        private readonly Logger                            $logger,
+        private readonly DatabaseManager                   $databaseManager,
+        private readonly EventStatisticsUpdateService      $eventStatisticsUpdateService,
     )
     {
     }
@@ -54,6 +53,13 @@ public function handleEvent(Refund $refund): void
             $this->updateOrderRefundedAmount($order->getId(), $refundedAmount);
             $this->updateOrderStatus($order, $refundedAmount);
             $this->updateEventStatistics($order, MoneyValue::fromMinorUnit($refund->amount, $order->getCurrency()));
+
+            $this->logger->info(__('Stripe refund successful'), [
+                'order_id' => $order->getId(),
+                'refunded_amount' => $refundedAmount,
+                'currency' => $order->getCurrency(),
+                'refund_id' => $refund->id,
+            ]);
         });
     }
 

backend/app/Services/Domain/Payment/Stripe/StripePaymentIntentRefundService.php

@@ -35,7 +35,8 @@ public function refundPayment(
                 'payment_intent' => $payment->getPaymentIntentId(),
                 'amount' => $amount->toMinorUnit()
             ],
-            opts: $this->getStripeAccountData($payment));
+            opts: $this->getStripeAccountData($payment),
+        );
     }
 
     private function getStripeAccountData(StripePaymentDomainObject $payment): array
@@ -47,7 +48,9 @@ private function getStripeAccountData(StripePaymentDomainObject $payment): array
                 );
             }
 
-            return ['stripe_account' => $payment->getConnectedAccountId()];
+            return [
+                'stripe_account' => $payment->getConnectedAccountId(),
+            ];
         }
 
         return [];

backend/resources/views/emails/auth/reset-password-success.blade.php

@@ -3,7 +3,7 @@
 
 {{ __('Your password has been reset for your account on :appName.', ['appName' => config('app.name')]) }}
 
-{{ __('If you did not request a password reset, please immediately contact reset your password.') }}
+{{ __('If you did not request a password reset, please immediately reset your password.') }}
 
 {{ __('Thank you') }}
 </x-mail::message>

backend/vapor.yml

@@ -2,16 +2,18 @@ id: 68983
 name: HiEvents
 environments:
   production:
+    gateway-version: 2.0
     domain: api.hi.events
     memory: 1024
     cli-memory: 512
     runtime: 'php-8.3:al2'
-    warm: 10
+    warm: 3
     cache: hievents-redis-prod
     database: hievents-db-prod
     queue: hievents-queue-prod
     queue-memory: 1024
     queue-concurrency: 5
+    concurrency: 100
     build:
       - 'composer install --no-dev'
       - 'php artisan optimize'

frontend/src/components/common/OrdersTable/index.tsx

@@ -132,10 +132,10 @@ export const OrdersTable = ({orders, event}: OrdersTableProps) => {
     };
 
     const ActionMenu = ({order}: { order: Order }) => {
-
         const isRefundable = !order.is_free_order
             && order.status !== 'AWAITING_OFFLINE_PAYMENT'
-            && order.payment_provider === 'STRIPE';
+            && order.payment_provider === 'STRIPE'
+            && order.refund_status !== 'REFUNDED';
 
         return <Group wrap={'nowrap'} gap={0} justify={'flex-end'}>
             <Menu shadow="md" width={200}>

misc/k6/event-hompage-load-test.js

@@ -3,18 +3,21 @@ import { check, sleep } from 'k6';
 
 export let options = {
     vus: 50,
-    duration: '60',
+    duration: '60s', // Using '60s' instead of '60000' for clarity
 };
 
 export default function () {
-    let res = http.get('https://demo.hi.events/event/1/dog-conf-2030');
+    let res = http.get('https://api.hi.events/public/events/1', {
+        headers: {
+            'Accept': 'application/json',
+        },
+    });
 
-    // Check if the response status is 200 (OK)
     check(res, {
         'status is 200': (r) => r.status === 200,
-        'response time < 200ms': (r) => r.timings.duration < 400,
+        'response time < 400ms': (r) => r.timings.duration < 400,
+        'response is JSON': (r) => r.headers['Content-Type'] && r.headers['Content-Type'].includes('application/json'),
     });
 
-    // Add a delay between requests
     sleep(1);
 }