Fix issues with md5 saving

Author: riasvdv

src/Blueprints/RedirectBlueprint.php

@@ -27,13 +27,9 @@ public function __invoke()
                                 'validate' => ['required', 'string', function (string $attribute, $value, Closure $fail) {
                                     $selectedSite = Session::get('statamic.cp.selected-site', Site::current()->handle());
 
-                                    $existing = Redirect::query()
-                                        ->where('source', $value)
-                                        ->when(request()->route('id'), fn ($query) => $query->where('id', '!=', request()->route('id')))
-                                        ->where('site', $selectedSite)
-                                        ->first();
+                                    $existing = Redirect::findByUrl($selectedSite, $value);
 
-                                    if ($existing) {
+                                    if ($existing && $existing->id() !== request()->route('id')) {
                                         $fail(__("This source already has a redirect associated with it."));
                                     }
                                 }],

src/Controllers/RedirectController.php

@@ -93,6 +93,7 @@ public function store(Request $request)
         $redirect = Redirect::make()
             ->locale($selectedSite)
             ->source($request->get('source'))
+            ->source_md5(md5($request->get('source')))
             ->destination($request->get('destination'))
             ->enabled($request->get('enabled'))
             ->type((int) $request->get('type'))
@@ -130,6 +131,7 @@ public function update($id, Request $request)
         $redirect
             ->locale($selectedSite)
             ->source($request->get('source'))
+            ->source_md5(md5($request->get('source')))
             ->destination($request->get('destination'))
             ->enabled($request->get('enabled'))
             ->type((int) $request->get('type'))

src/Eloquent/Redirects/RedirectRepository.php

@@ -36,10 +36,25 @@ public function findByUrl(string $siteHandle, string $url): ?Redirect
             ->where('site', $siteHandle)
             ->where(function (RedirectQueryBuilder $query) use ($url) {
                 $query
-                    ->orWhere('source', $url)
-                    ->orWhere('source', str($url)->start('/'))
-                    ->orWhere('source', str($url)->finish('/'))
-                    ->orWhere('source', str($url)->start('/')->finish('/'));
+                    ->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);
+                    });
             })
             ->where('match_type', MatchTypeEnum::EXACT)
             ->orderBy('order')
@@ -104,6 +119,7 @@ public static function fromModel(Model $model)
         return (new Redirect)
             ->id($model->id)
             ->source($model->source)
+            ->source_md5(md5($model->source))
             ->destination($model->destination)
             ->type($model->type)
             ->matchType($model->match_type)
@@ -117,6 +133,7 @@ private function toModel(Redirect $redirect)
     {
         $properties = [
             'source' => $redirect->source(),
+            'source_md5' => md5($redirect->source()),
             'destination' => $redirect->destination(),
             'match_type' => $redirect->matchType(),
             'type' => $redirect->type(),