Fix webhook causing some checkouts to fail (#464)

Author: daveearley

backend/app/Repository/Eloquent/BaseRepository.php

@@ -62,7 +62,10 @@ public function setMaxPerPage(int $maxPerPage): static
 
     public function all(array $columns = self::DEFAULT_COLUMNS): Collection
     {
-        return $this->handleResults($this->model->all($columns));
+        $models = $this->model->all($columns);
+        $this->resetModel();
+
+        return $this->handleResults($models);
     }
 
     public function paginate(
@@ -121,7 +124,10 @@ public function paginateEloquentRelation(
      */
     public function findById(int $id, array $columns = self::DEFAULT_COLUMNS): DomainObjectInterface
     {
-        return $this->handleSingleResult($this->model->findOrFail($id, $columns));
+        $model = $this->model->findOrFail($id, $columns);
+        $this->resetModel();
+
+        return $this->handleSingleResult($model);
     }
 
     public function findFirstByField(
@@ -138,7 +144,10 @@ public function findFirstByField(
 
     public function findFirst(int $id, array $columns = self::DEFAULT_COLUMNS): ?DomainObjectInterface
     {
-        return $this->handleSingleResult($this->model->findOrFail($id, $columns));
+        $model = $this->model->findOrFail($id, $columns);
+        $this->resetModel();
+
+        return $this->handleSingleResult($model);
     }
 
     public function findWhere(

backend/app/Services/Application/Handlers/Order/CompleteOrderHandler.php

@@ -62,7 +62,7 @@ public function __construct(
      */
     public function handle(string $orderShortId, CompleteOrderDTO $orderData): OrderDomainObject
     {
-        return DB::transaction(function () use ($orderData, $orderShortId) {
+        $updatedOrder = DB::transaction(function () use ($orderData, $orderShortId) {
             $orderDTO = $orderData->order;
 
             $order = $this->getOrder($orderShortId);
@@ -85,19 +85,21 @@ public function handle(string $orderShortId, CompleteOrderDTO $orderData): Order
                 $this->productQuantityUpdateService->updateQuantitiesFromOrder($updatedOrder);
             }
 
-            OrderStatusChangedEvent::dispatch($updatedOrder);
-
-            if ($updatedOrder->isOrderCompleted()) {
-                $this->domainEventDispatcherService->dispatch(
-                    new OrderEvent(
-                        type: DomainEventType::ORDER_CREATED,
-                        orderId: $updatedOrder->getId(),
-                    )
-                );
-            }
-
             return $updatedOrder;
         });
+
+        OrderStatusChangedEvent::dispatch($updatedOrder);
+
+        if ($updatedOrder->isOrderCompleted()) {
+            $this->domainEventDispatcherService->dispatch(
+                new OrderEvent(
+                    type: DomainEventType::ORDER_CREATED,
+                    orderId: $updatedOrder->getId(),
+                )
+            );
+        }
+
+        return $updatedOrder;
     }
 
     /**

backend/app/Services/Infrastructure/DomainEvents/DomainEventDispatcherService.php

@@ -4,15 +4,29 @@
 
 use HiEvents\Services\Infrastructure\DomainEvents\Events\BaseDomainEvent;
 use Illuminate\Events\Dispatcher as EventDispatcher;
+use Psr\Log\LoggerInterface;
+use Throwable;
 
 class DomainEventDispatcherService
 {
-    public function __construct(private readonly EventDispatcher $dispatcher)
+    public function __construct(
+        private readonly EventDispatcher $dispatcher,
+        private readonly LoggerInterface $logger,
+    )
     {
     }
 
+    /**
+     * @throws Throwable
+     */
     public function dispatch(BaseDomainEvent $event): void
     {
-        $this->dispatcher->dispatch($event);
+        try {
+            $this->dispatcher->dispatch($event);
+        } catch (Throwable $e) {
+            $this->logger->error('Failed to dispatch domain event', ['event' => $event, 'exception' => $e]);
+
+            throw $e;
+        }
     }
 }