Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/Redirects/Stache/ErrorRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public function save(Error $error): void
}

if (! $error->id()) {
$slug = Str::slug($error->url());
$id = $slug;
$id = $slug = $this->generateId($error->url());
$suffix = 1;

while ($this->query()->where('id', $id)->where('site', $error->site())->first()) {
Expand All @@ -69,6 +68,15 @@ public function delete(Error $error): void
$this->store->delete($error);
}

private function generateId(string $url): string
{
if ($slug = Str::slug($url)) {
return $slug;
}

return $this->stache->generateId();
}

public function blueprint(): Blueprint
{
return (new ErrorBlueprint)();
Expand Down
12 changes: 10 additions & 2 deletions src/Redirects/Stache/RedirectRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public function save(Redirect $redirect): void
}

if (! $redirect->id()) {
$slug = Str::slug($redirect->source());
$id = $slug;
$id = $slug = $this->generateId($redirect->source());
$suffix = 1;

while ($this->query()->where('id', $id)->where('site', $redirect->site())->first()) {
Expand All @@ -69,6 +68,15 @@ public function delete(Redirect $redirect): void
$this->store->delete($redirect);
}

private function generateId(string $source): string
{
if ($slug = Str::slug($source)) {
return $slug;
}

return $this->stache->generateId();
}

public function blueprint(): Blueprint
{
return (new RedirectBlueprint)();
Expand Down
15 changes: 15 additions & 0 deletions tests/Redirects/Stache/ErrorRepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Statamic\SeoPro\Facades;
use Statamic\SeoPro\Redirects\Error;
use Statamic\SeoPro\Redirects\Stache\ErrorRepository;
use Statamic\Support\Str;
use Statamic\Testing\Concerns\PreventsSavingStacheItemsToDisk;
use Tests\TestCase;

Expand Down Expand Up @@ -75,6 +76,20 @@ public function it_generates_id_from_url_when_saving_without_id()
$this->assertEquals('broken-link', $error->id());
}

#[Test]
public function it_generates_a_uuid_id_when_url_cannot_be_slugged()
{
$error = Facades\Error::make()
->url('/)')
->hits(1)
->lastHitAt('2026-04-21 12:00:00');

$this->repo->save($error);

$this->assertTrue(Str::isUuid($error->id()));
$this->assertStringContainsString('errors/'.$error->id().'.yaml', $error->path());
}

#[Test]
public function it_appends_suffix_when_generated_id_already_exists()
{
Expand Down
16 changes: 16 additions & 0 deletions tests/Redirects/Stache/RedirectRepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Statamic\SeoPro\Facades;
use Statamic\SeoPro\Redirects\Redirect;
use Statamic\SeoPro\Redirects\Stache\RedirectRepository;
use Statamic\Support\Str;
use Statamic\Testing\Concerns\PreventsSavingStacheItemsToDisk;
use Tests\TestCase;

Expand Down Expand Up @@ -80,6 +81,21 @@ public function it_generates_id_from_source_when_saving_without_id()
$this->assertEquals('old-url', $redirect->id());
}

#[Test]
public function it_generates_a_uuid_id_when_source_cannot_be_slugged()
{
$redirect = Facades\Redirect::make()
->source('/)')
->destination('/new-url')
->responseCode(301)
->enabled(true);

$this->repo->save($redirect);

$this->assertTrue(Str::isUuid($redirect->id()));
$this->assertStringContainsString('redirects/'.$redirect->id().'.yaml', $redirect->path());
}

#[Test]
public function it_appends_suffix_when_generated_id_already_exists()
{
Expand Down
Loading