feat: add dedicated method to get id for existing redirect

tinect · Sep 12, 2024 · b9caa42 · b9caa42
1 parent b3be123
commit b9caa42
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/Message/TinectRedirectUpdateHandler.php b/src/Message/TinectRedirectUpdateHandler.php
@@ -31,7 +31,7 @@ public function __invoke(TinectRedirectUpdateMessage $message): void
         $redirectId = $message->getId();
 
         if ($redirectId === null) {
-            $redirectId = $this->redirectFinderService->find($message->getSource(), $message->getSalesChannelDomainId())?->getId();
+            $redirectId = $this->redirectFinderService->findId($message->getSource(), $message->getSalesChannelDomainId());
         }
 
         if ($message->canCreateRedirect()) {

diff --git a/src/Services/RedirectFinderService.php b/src/Services/RedirectFinderService.php
@@ -23,7 +23,28 @@ public function __construct(
     public function find(string $path, ?string $salesChannelDomainId): ?RedirectEntity
     {
         $context  = new Context(new SystemSource());
-        $criteria = (new Criteria())
+        $criteria = $this->getCriteria($path, $salesChannelDomainId);
+
+        $redirect = $this->tinectRedirectsRedirectRepository->search($criteria, $context)->first();
+
+        if ($redirect instanceof RedirectEntity) {
+            return $redirect;
+        }
+
+        return null;
+    }
+
+    public function findId(string $path, ?string $salesChannelDomainId): ?string
+    {
+        $context  = new Context(new SystemSource());
+        $criteria = $this->getCriteria($path, $salesChannelDomainId);
+
+        return $this->tinectRedirectsRedirectRepository->searchIds($criteria, $context)->firstId();
+    }
+
+    private function getCriteria(string $path, ?string $salesChannelDomainId): Criteria
+    {
+        return (new Criteria())
             ->addFilter(new EqualsFilter('source', $path))
             ->addFilter(
                 new MultiFilter(MultiFilter::CONNECTION_OR, [
@@ -33,13 +54,5 @@ public function find(string $path, ?string $salesChannelDomainId): ?RedirectEnti
             )
             ->addSorting(new FieldSorting('salesChannelDomainId', FieldSorting::DESCENDING))
             ->setLimit(1);
-
-        $redirect = $this->tinectRedirectsRedirectRepository->search($criteria, $context)->first();
-
-        if ($redirect instanceof RedirectEntity) {
-            return $redirect;
-        }
-
-        return null;
     }
 }