Remove try catch && add custom exception

Author: DominikWolos

config/packages/messenger.yaml

@@ -5,7 +5,8 @@ framework:
                 dsn: "%env(MESSENGER_USER_COM_ASYNCHRONOUS)%"
                 retry_strategy:
                     max_retries: 5
-                    delay: 300000
+                    #1000 * 60 * 10
+                    delay: 600000
                     multiplier: 2
         routing:
             BitBag\SyliusUserComPlugin\Message\OrderSynchronization: user_com_asynchronous

config/services/handler.xml

@@ -22,7 +22,6 @@
             <argument type="service" id="sylius.repository.customer"/>
             <argument type="service" id="bit_bag.sylius_user_com_plugin.provider.user_com_api_aware_resource_provider"/>
             <argument type="service" id="bit_bag.sylius_user_com_plugin.manager.customer_update_manager"/>
-            <argument type="service" id="monolog.logger.user_com"/>
             <tag name="messenger.message_handler"/>
         </service>
     </services>

src/Api/AbstractClient.php

@@ -15,7 +15,6 @@
 use BitBag\SyliusUserComPlugin\Trait\UserComApiAwareInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Messenger\Exception\RecoverableMessageHandlingException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -68,7 +67,7 @@ protected function request(
             }
 
             if ($status > 499 && $status < 600) {
-                throw new RecoverableMessageHandlingException(
+                throw new UserComServerException(
                     sprintf(
                         'Response status code : %s, response : %s',
                         $status,
@@ -94,7 +93,7 @@ protected function request(
                 'options' => $options,
             ]);
 
-            if ($e instanceof RecoverableMessageHandlingException) {
+            if ($e instanceof UserComServerException) {
                 throw $e;
             }
 

src/Exception/UserComServerException.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BitBag\SyliusUserComPlugin\Exception;
+
+final class UserComServerException extends \Exception
+{
+}

src/Handler/OrderSynchronizationHandler.php

@@ -33,25 +33,17 @@ public function __construct(
 
     public function __invoke(OrderSynchronization $orderSynchronization): void
     {
-        try {
-            Assert::isInstanceOf($this->orderRepository, OrderRepositoryInterface::class);
-            $order = $this->orderRepository->find($orderSynchronization->getOrderId());
-            if (!$order instanceof OrderInterface) {
-                throw new UnrecoverableMessageHandlingException(
-                    sprintf(
-                        'Order with id %s has not been found.',
-                        $orderSynchronization->getOrderId(),
-                    ),
-                );
-            }
-
-            $this->orderUpdateManager->handle($order);
-        } catch (\Exception $exception) {
-            if ($exception instanceof RecoverableMessageHandlingException) {
-                throw $exception;
-            }
-
-            throw new UnrecoverableMessageHandlingException($exception->getMessage());
+        Assert::isInstanceOf($this->orderRepository, OrderRepositoryInterface::class);
+        $order = $this->orderRepository->find($orderSynchronization->getOrderId());
+        if (!$order instanceof OrderInterface) {
+            throw new UnrecoverableMessageHandlingException(
+                sprintf(
+                    'Order with id %s has not been found.',
+                    $orderSynchronization->getOrderId(),
+                ),
+            );
         }
+
+        $this->orderUpdateManager->handle($order);
     }
 }

src/Handler/UserSynchronizationHandler.php

@@ -31,49 +31,39 @@ public function __construct(
         private readonly RepositoryInterface $customerRepository,
         private readonly UserComApiAwareResourceProviderInterface $userComApiAwareResourceProvider,
         private readonly CustomerUpdateManagerInterface $updateManager,
-        private readonly LoggerInterface $logger,
     ) {
     }
 
     public function __invoke(UserSynchronization $userSynchronization): void
     {
-        try {
-            Assert::isInstanceOf($this->customerRepository, CustomerRepositoryInterface::class);
-            Assert::isInstanceOf($this->addressRepository, AddressRepositoryInterface::class);
-
-            $customer = $this->customerRepository->find($userSynchronization->getCustomerId());
-            Assert::isInstanceOf($customer, CustomerInterface::class);
-
-            $email = $userSynchronization->getEmail();
-
-            $addressId = $userSynchronization->getAddressId();
-            $address = $this->getAddress($addressId);
-
-            $resourceId = $userSynchronization->getUserComApiAwareResourceId();
-
-            $userComApiAwareResource = $this->userComApiAwareResourceProvider->getApiAwareResourceById($resourceId);
-            if (null === $userComApiAwareResource) {
-                throw new UnrecoverableMessageHandlingException('User.com API-aware resource not found');
-            }
-
-            $eventName = $userSynchronization->getEventName();
-
-            $this->updateManager->manageChange(
-                $eventName,
-                $userComApiAwareResource,
-                $customer,
-                $address,
-                $email,
-                $userSynchronization->getUserComCookie(),
-            );
-        } catch (\Exception $exception) {
-            $this->logger->critical(sprintf('User.com synchronization failed - %s', $exception->getMessage()));
-            if ($exception instanceof RecoverableMessageHandlingException) {
-                throw $exception;
-            }
-
-            throw new UnrecoverableMessageHandlingException($exception->getMessage());
+        Assert::isInstanceOf($this->customerRepository, CustomerRepositoryInterface::class);
+        Assert::isInstanceOf($this->addressRepository, AddressRepositoryInterface::class);
+
+        $customer = $this->customerRepository->find($userSynchronization->getCustomerId());
+        Assert::isInstanceOf($customer, CustomerInterface::class);
+
+        $email = $userSynchronization->getEmail();
+
+        $addressId = $userSynchronization->getAddressId();
+        $address = $this->getAddress($addressId);
+
+        $resourceId = $userSynchronization->getUserComApiAwareResourceId();
+
+        $userComApiAwareResource = $this->userComApiAwareResourceProvider->getApiAwareResourceById($resourceId);
+        if (null === $userComApiAwareResource) {
+            throw new UnrecoverableMessageHandlingException('User.com API-aware resource not found');
         }
+
+        $eventName = $userSynchronization->getEventName();
+
+        $this->updateManager->manageChange(
+            $eventName,
+            $userComApiAwareResource,
+            $customer,
+            $address,
+            $email,
+            $userSynchronization->getUserComCookie(),
+        );
     }
 
     private function getAddress(?int $addressId): ?AddressInterface