Reintroduce catch-all exception handler

Author: cwdt

src/Exception/OrderNotFoundException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Picqer\Shopware6Plugin\Exception;
+
+use Exception;
+
+final class OrderNotFoundException extends Exception
+{
+
+}

src/Subscriber/EventSubscriber.php

@@ -2,8 +2,10 @@
 
 namespace Picqer\Shopware6Plugin\Subscriber;
 
+use Exception;
 use Picqer\Shopware6Plugin\Client\PicqerClient;
 use Picqer\Shopware6Plugin\Exception\IncompleteConfigurationException;
+use Picqer\Shopware6Plugin\Exception\OrderNotFoundException;
 use Picqer\Shopware6Plugin\Exception\RequestFailedException;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Order\OrderEntity;
@@ -51,32 +53,56 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            OrderEvents::ORDER_WRITTEN_EVENT => 'pushOrder',
+            OrderEvents::ORDER_WRITTEN_EVENT => 'handle',
         ];
     }
 
-    public function pushOrder(EntityWrittenEvent $event): void
+    public function handle(EntityWrittenEvent $event): void
     {
         if (! isset($event->getIds()[0])) {
             return;
         }
 
-        $order = $this->orderRepository->search(new Criteria([$event->getIds()[0]]), $event->getContext())->first();
-        if (! $order instanceof OrderEntity) {
-            return;
-        }
+        $orderId = $event->getIds()[0];
 
-        $salesChannelId = $order->getSalesChannelId();
+        try {
+            $order = $this->orderRepository->search(new Criteria([$orderId]), $event->getContext())->first();
+            if (! $order instanceof OrderEntity) {
+                throw new OrderNotFoundException(sprintf('Order [%s] not found', $orderId));
+            }
 
-        $disabled = $this->configService->getBool($this->buildConfigKey('disabled'), $salesChannelId);
-        if ($disabled) {
-            return;
+            $salesChannelId = $order->getSalesChannelId();
+            $disabled = $this->configService->getBool($this->buildConfigKey('disabled'), $salesChannelId);
+            if ($disabled) {
+                return;
+            }
+
+            $subdomain = $this->configService->getString($this->buildConfigKey('subdomain'), $salesChannelId);
+            $connectionKey = $this->configService->getString($this->buildConfigKey('connectionkey'), $salesChannelId);
+            $debug = $this->configService->getBool($this->buildConfigKey('debug'), $salesChannelId);
+
+            $this->pushOrderToPicqer($subdomain, $connectionKey, $order, $debug, $salesChannelId);
+        } catch (Exception $e) {
+            $this->logger->error('[Picqer] Caught unexpected exception', [
+                'exception' => get_class($e),
+                'message' => $e->getMessage(),
+                'orderId' => $orderId,
+            ]);
         }
+    }
 
-        $subdomain = $this->configService->getString($this->buildConfigKey('subdomain'), $salesChannelId);
-        $connectionKey = $this->configService->getString($this->buildConfigKey('connectionkey'), $salesChannelId);
-        $debug = $this->configService->getBool($this->buildConfigKey('debug'), $salesChannelId);
+    private function buildConfigKey(string $key): string
+    {
+        return sprintf('PicqerExtendedIntegration.config.%s', $key);
+    }
 
+    private function pushOrderToPicqer(
+        string $subdomain,
+        string $connectionKey,
+        OrderEntity $order,
+        bool $debug,
+        string $salesChannelId
+    ): void {
         try {
             if (empty($subdomain) || empty($connectionKey)) {
                 throw new IncompleteConfigurationException($subdomain, $connectionKey);
@@ -111,9 +137,4 @@ public function pushOrder(EntityWrittenEvent $event): void
             ]);
         }
     }
-
-    private function buildConfigKey(string $key): string
-    {
-        return sprintf('PicqerExtendedIntegration.config.%s', $key);
-    }
 }