Feat/refactor

src/Message/TinectRedirectUpdateHandler.php

@@ -9,31 +9,43 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Doctrine\RetryableQuery;
 use Shopware\Core\Framework\Uuid\Uuid;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Tinect\Redirects\Services\ExcludedService;
+use Tinect\Redirects\Services\RedirectFinderService;
 
 #[AsMessageHandler]
 readonly class TinectRedirectUpdateHandler
 {
     public function __construct(
         private Connection $connection,
+        private ExcludedService $excludedService,
+        private RedirectFinderService $redirectFinderService
     ) {
     }
 
     public function __invoke(TinectRedirectUpdateMessage $message): void
     {
+        if ($this->excludedService->isExcluded($message->getSource(), $message->getSalesChannelDomainId())) {
+            return;
+        }
+
         $redirectId = $message->getId();
 
-        if ($message->isCreateRedirect()) {
-            $redirectId = $this->createOrUpdateRedirect($message);
-        } else {
-            $this->updateRedirectCount($message);
+        if ($redirectId === null) {
+            $redirectId = $this->redirectFinderService->find($message->getSource(), $message->getSalesChannelDomainId())?->getId();
+        }
+
+        if ($message->canCreateRedirect()) {
+            $redirectId = $this->createOrUpdateRedirect($message, $redirectId);
+        } elseif ($redirectId !== null) {
+            $this->updateRedirectCount($redirectId);
         }
 
-        if (\is_string($redirectId)) {
+        if ($redirectId !== null) {
             $this->createRedirectRequest($message, $redirectId);
         }
     }
 
-    private function createOrUpdateRedirect(TinectRedirectUpdateMessage $message): string
+    private function createOrUpdateRedirect(TinectRedirectUpdateMessage $message, ?string $redirectId): string
     {
         $query = new RetryableQuery(
             $this->connection,
@@ -44,8 +56,12 @@ private function createOrUpdateRedirect(TinectRedirectUpdateMessage $message): s
             )
         );
 
+        if (!\is_string($redirectId)) {
+            $redirectId = Uuid::randomHex();
+        }
+
         $params = [
-            'id'                   => \is_string($message->getId()) ? Uuid::fromHexToBytes($message->getId()) : Uuid::randomBytes(),
+            'id'                   => Uuid::fromHexToBytes($redirectId),
             'source'               => $message->getSource(),
             'salesChannelDomainId' => null,
             'createdAt'            => $message->getCreatedAt()->format(Defaults::STORAGE_DATE_TIME_FORMAT),
@@ -60,12 +76,8 @@ private function createOrUpdateRedirect(TinectRedirectUpdateMessage $message): s
         return Uuid::fromBytesToHex($params['id']);
     }
 
-    private function updateRedirectCount(TinectRedirectUpdateMessage $message): void
+    private function updateRedirectCount(string $redirectId): void
     {
-        if (!\is_string($message->getId())) {
-            return;
-        }
-
         $query = new RetryableQuery(
             $this->connection,
             $this->connection->prepare(
@@ -74,7 +86,7 @@ private function updateRedirectCount(TinectRedirectUpdateMessage $message): void
         );
 
         $params = [
-            'id' => Uuid::fromHexToBytes($message->getId()),
+            'id' => Uuid::fromHexToBytes($redirectId),
         ];
 
         $query->execute($params);

src/Message/TinectRedirectUpdateMessage.php

@@ -57,7 +57,7 @@ public function getReferer(): ?string
         return substr($this->referer, 0, RedirectRequestDefinition::MAX_LENGTH_REFERER);
     }
 
-    public function isCreateRedirect(): bool
+    public function canCreateRedirect(): bool
     {
         return $this->createRedirect;
     }

src/Services/RedirectFinderService.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tinect\Redirects\Services;
+
+use Shopware\Core\Framework\Api\Context\SystemSource;
+use Shopware\Core\Framework\Context;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\MultiFilter;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
+use Tinect\Redirects\Content\Redirect\RedirectEntity;
+
+readonly class RedirectFinderService
+{
+    public function __construct(
+        private EntityRepository $tinectRedirectsRedirectRepository,
+    ) {
+    }
+
+    public function find(string $path, ?string $salesChannelDomainId): ?RedirectEntity
+    {
+        $context  = new Context(new SystemSource());
+        $criteria = (new Criteria())
+            ->addFilter(new EqualsFilter('source', $path))
+            ->addFilter(
+                new MultiFilter(MultiFilter::CONNECTION_OR, [
+                    new EqualsFilter('salesChannelDomainId', $salesChannelDomainId),
+                    new EqualsFilter('salesChannelDomainId', null),
+                ])
+            )
+            ->addSorting(new FieldSorting('salesChannelDomainId', FieldSorting::DESCENDING))
+            ->setLimit(1);
+
+        $redirect = $this->tinectRedirectsRedirectRepository->search($criteria, $context)->first();
+
+        if ($redirect instanceof RedirectEntity) {
+            return $redirect;
+        }
+
+        return null;
+    }
+}

src/Subscriber/BeforeSendResponseSubscriber.php

@@ -5,13 +5,6 @@
 namespace Tinect\Redirects\Subscriber;
 
 use Shopware\Core\Content\Seo\SeoUrlPlaceholderHandlerInterface;
-use Shopware\Core\Framework\Api\Context\SystemSource;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\MultiFilter;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
 use Shopware\Core\PlatformRequest;
 use Shopware\Core\SalesChannelRequest;
 use Shopware\Core\System\SalesChannel\Context\AbstractSalesChannelContextFactory;
@@ -29,21 +22,19 @@
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Tinect\Redirects\Content\Redirect\RedirectEntity;
 use Tinect\Redirects\Message\TinectRedirectUpdateMessage;
-use Tinect\Redirects\Services\ExcludedService;
+use Tinect\Redirects\Services\RedirectFinderService;
 
 readonly class BeforeSendResponseSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private EntityRepository $tinectRedirectsRedirectRepository,
         private SeoUrlPlaceholderHandlerInterface $seoUrlPlaceholderHandler,
         #[Autowire(service: SalesChannelContextFactory::class)]
         private AbstractSalesChannelContextFactory $salesChannelContextFactory,
         private SystemConfigService $systemConfigService,
         private MessageBusInterface $messageBus,
         private RequestTransformer $requestTransformer,
-        private ExcludedService $excludedService
+        private RedirectFinderService $redirectFinderService
     ) {
     }
 
@@ -102,27 +93,14 @@ private function handleRequest(Request $request): ?Response
             $salesChannelDomainId = null;
         }
 
-        $context  = new Context(new SystemSource());
-        $criteria = (new Criteria())
-            ->addFilter(new EqualsFilter('source', $path))
-            ->addFilter(
-                new MultiFilter(MultiFilter::CONNECTION_OR, [
-                    new EqualsFilter('salesChannelDomainId', $salesChannelDomainId),
-                    new EqualsFilter('salesChannelDomainId', null),
-                ])
-            )
-            ->addSorting(new FieldSorting('salesChannelDomainId', FieldSorting::DESCENDING))
-            ->setLimit(1);
-
-        /** @var ?RedirectEntity $redirect */
-        $redirect = $this->tinectRedirectsRedirectRepository->search($criteria, $context)->first();
+        $redirect = $this->redirectFinderService->find($path, $salesChannelDomainId);
 
         $message = new TinectRedirectUpdateMessage(
             source: $path,
             salesChannelDomainId: $salesChannelDomainId,
             ipAddress: $this->getIpAddress($request),
             userAgent: $request->headers->get('User-Agent') ?? '',
-            createRedirect: $this->canCreateRedirect($path, $salesChannelDomainId),
+            createRedirect: $this->canCreateRedirect($salesChannelDomainId),
             id: $redirect?->getId(),
             referer: $request->headers->get('referer'),
         );
@@ -210,12 +188,8 @@ private function canSaveIpAddress(?string $salesChannelId): bool
         return $this->systemConfigService->getBool('TinectRedirects.config.saveIpAddresses', $salesChannelId);
     }
 
-    private function canCreateRedirect(string $path, ?string $salesChannelId): bool
+    private function canCreateRedirect(?string $salesChannelId): bool
     {
-        if (!$this->systemConfigService->getBool('TinectRedirects.config.createNewRedirects', $salesChannelId)) {
-            return false;
-        }
-
-        return !$this->excludedService->isExcluded($path, $salesChannelId);
+        return $this->systemConfigService->getBool('TinectRedirects.config.createNewRedirects', $salesChannelId);
     }
 }