Test for more source variations

Author: riasvdv

src/Eloquent/Redirects/RedirectRepository.php

@@ -6,6 +6,7 @@
 use Rias\StatamicRedirect\Contracts\RedirectRepository as RepositoryContract;
 use Rias\StatamicRedirect\Data\Redirect;
 use Rias\StatamicRedirect\Enums\MatchTypeEnum;
+use Rias\StatamicRedirect\GenerateUrlVariants;
 use Statamic\Data\DataCollection;
 use Statamic\Stache\Stache;
 
@@ -35,26 +36,14 @@ public function findByUrl(string $siteHandle, string $url): ?Redirect
             ->where('enabled', true)
             ->where('site', $siteHandle)
             ->where(function (RedirectQueryBuilder $query) use ($url) {
-                $query
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $query->where('source_md5', md5($url))
-                            ->where('source', $url);
-                    })
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $source = str($url)->start('/');
-                        $query->where('source_md5', md5($source))
-                            ->where('source', $source);
-                    })
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $source = str($url)->finish('/');
-                        $query->where('source_md5', md5($source))
-                            ->where('source', $source);
-                    })
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $source = str($url)->start('/')->finish('/');
-                        $query->where('source_md5', md5($source))
-                            ->where('source', $source);
+                $variants = app(GenerateUrlVariants::class)($url);
+
+                foreach ($variants as $variant) {
+                    $query->orWhere(function (RedirectQueryBuilder $query) use ($variant) {
+                        $query->where('source_md5', md5($variant))
+                            ->where('source', $variant);
                     });
+                }
             })
             ->where('match_type', MatchTypeEnum::EXACT)
             ->orderBy('order')

src/GenerateUrlVariants.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rias\StatamicRedirect;
+
+class GenerateUrlVariants
+{
+    public function __invoke(string $url)
+    {
+        $variants = [
+            $url,
+            str($url)->start('/'),
+            str($url)->finish('/'),
+            str($url)->start('/')->finish('/'),
+            str_starts_with($url, '/') ? str($url)->substr(1) : null,
+        ];
+
+        if (str_contains($url, '?')) {
+            $url = str($url)->before('?')->value();
+
+            $variants = array_merge($variants, [
+                $url,
+                str($url)->start('/'),
+                str($url)->finish('/'),
+                str($url)->start('/')->finish('/'),
+                str_starts_with($url, '/') ? str($url)->substr(1) : null,
+            ]);
+        }
+
+        return array_unique(array_filter($variants));
+    }
+}

src/Stache/Redirects/RedirectRepository.php

@@ -4,8 +4,10 @@
 
 use Rias\StatamicRedirect\Contracts\RedirectRepository as RepositoryContract;
 use Rias\StatamicRedirect\Data\Redirect;
+use Rias\StatamicRedirect\Eloquent\Redirects\RedirectQueryBuilder;
 use Rias\StatamicRedirect\Enums\MatchTypeEnum;
 use Rias\StatamicRedirect\Events\RedirectSaved;
+use Rias\StatamicRedirect\GenerateUrlVariants;
 use Statamic\Data\DataCollection;
 use Statamic\Facades\Stache as StacheFacade;
 use Statamic\Stache\Stache;
@@ -41,26 +43,14 @@ public function findByUrl(string $siteHandle, string $url): ?Redirect
             ->where('enabled', true)
             ->where('site', $siteHandle)
             ->where(function (RedirectQueryBuilder $query) use ($url) {
-                $query
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $query->where('source_md5', md5($url))
-                            ->where('source', $url);
-                    })
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $source = str($url)->start('/');
-                        $query->where('source_md5', md5($source))
-                            ->where('source', $source);
-                    })
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $source = str($url)->finish('/');
-                        $query->where('source_md5', md5($source))
-                            ->where('source', $source);
-                    })
-                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
-                        $source = str($url)->start('/')->finish('/');
-                        $query->where('source_md5', md5($source))
-                            ->where('source', $source);
+                $variants = app(GenerateUrlVariants::class)($url);
+
+                foreach ($variants as $variant) {
+                    $query->orWhere(function (RedirectQueryBuilder $query) use ($variant) {
+                        $query->where('source_md5', md5($variant))
+                            ->where('source', $variant);
                     });
+                }
             })
             ->where('matchType', MatchTypeEnum::EXACT)
             ->orderBy('order')