Skip to content

[Fix] Prevent multiple current records after publishing draft #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 23, 2023
Merged

[Fix] Prevent multiple current records after publishing draft #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a7511d
[Fix] Prevent multiple current records after publishing draft
oddvalue Jun 23, 2023
ed66263
Fix styling
oddvalue Jun 23, 2023
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
31 changes: 20 additions & 11 deletions src/Concerns/HasDrafts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,19 @@ public function getDraftableAttributes(): array

public function setCurrent(): void
{
$oldCurrent = $this->revisions()->withDrafts()->current()->excludeRevision($this)->first();
$this->{$this->getIsCurrentColumn()} = true;

static::saved(function (Model $model) use ($oldCurrent): void {
if ($model->isNot($this) || ! $oldCurrent) {
static::saved(function (Model $model): void {
if ($model->isNot($this)) {
return;
}

$oldCurrent->{$this->getIsCurrentColumn()} = false;
$oldCurrent->timestamps = false;
$oldCurrent->saveQuietly();
$this->revisions()
->withDrafts()
->current()
->excludeRevision($this)
->update([$this->getIsCurrentColumn() => false]);
});

$this->{$this->getIsCurrentColumn()} = true;
}

public function setLive(): void
Expand Down Expand Up @@ -199,7 +199,9 @@ public function setLive(): void
if ($related = $this->{$relationName}) {
$replicated = $related->replicate();

$method = method_exists($replicated, 'getDraftableAttributes') ? 'getDraftableAttributes' : 'getAttributes';
$method = method_exists($replicated, 'getDraftableAttributes')
? 'getDraftableAttributes'
: 'getAttributes';

$published->{$relationName}()->create($replicated->$method());
}
Expand All @@ -209,7 +211,9 @@ public function setLive(): void
$this->{$relationName}()->get()->each(function ($model) use ($published, $relationName) {
$replicated = $model->replicate();

$method = method_exists($replicated, 'getDraftableAttributes') ? 'getDraftableAttributes' : 'getAttributes';
$method = method_exists($replicated, 'getDraftableAttributes')
? 'getDraftableAttributes'
: 'getAttributes';

$published->{$relationName}()->create($replicated->$method());
});
Expand Down Expand Up @@ -380,11 +384,16 @@ public function getIsCurrentColumn(): string

public function getUuidColumn(): string
{
return defined(static::class.'::UUID')
return defined(static::class . '::UUID')
? static::UUID
: config('drafts.column_names.uuid', 'uuid');
}

public function isCurrent(): bool
{
return $this->{$this->getIsCurrentColumn()} ?? false;
}

/*
|--------------------------------------------------------------------------
| RELATIONS
Expand Down
48 changes: 24 additions & 24 deletions src/Scopes/PublishingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,30 @@ public function extend(Builder $builder): void
}
}

// protected function addPublish(Builder $builder): void
// {
// $builder->macro('publish', function (Builder $builder) {
// $builder->withDrafts();
//
// return $builder->update([$builder->getModel()->getIsPublishedColumn() => now()]);
// });
// }
//
// protected function addUnpublish(Builder $builder): void
// {
// $builder->macro('unpublish', function (Builder $builder) {
// return $builder->update([$builder->getModel()->getIsPublishedColumn() => null]);
// });
// }
//
// protected function addSchedule(Builder $builder): void
// {
// $builder->macro('schedule', function (Builder $builder, string | \DateTimeInterface $date) {
// $builder->withDrafts();
//
// return $builder->update([$builder->getModel()->getIsPublishedColumn() => $date]);
// });
// }
// protected function addPublish(Builder $builder): void
// {
// $builder->macro('publish', function (Builder $builder) {
// $builder->withDrafts();
//
// return $builder->update([$builder->getModel()->getIsPublishedColumn() => now()]);
// });
// }
//
// protected function addUnpublish(Builder $builder): void
// {
// $builder->macro('unpublish', function (Builder $builder) {
// return $builder->update([$builder->getModel()->getIsPublishedColumn() => null]);
// });
// }
//
// protected function addSchedule(Builder $builder): void
// {
// $builder->macro('schedule', function (Builder $builder, string | \DateTimeInterface $date) {
// $builder->withDrafts();
//
// return $builder->update([$builder->getModel()->getIsPublishedColumn() => $date]);
// });
// }

protected function addPublished(Builder $builder): void
{
Expand Down
25 changes: 25 additions & 0 deletions tests/PublishingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,28 @@
expect(Post::withoutDrafts()->pluck('id'))
->toHaveCount(1);
});

it('can publish a draft that is not the current one', function () {
\Oddvalue\LaravelDrafts\Facades\LaravelDrafts::withDrafts();

Post::factory()->create(['title' => 'a']);

$post = Post::where('title', 'a')->first();
$post->title = 'b';
$b = $post->saveAsDraft();

$post = Post::where('title', 'b')->first();
$post->title = 'c';
$post->saveAsDraft();

expect(Post::where('title', 'a')->first()->isPublished())->toBeTrue();
expect(Post::where('title', 'c')->first()->isCurrent())->toBeTrue();

$draftB = Post::where('title', 'b')->first();
$draftB->setLive();
$draftB->save();

expect(Post::where('title', 'a')->first()->isPublished())->toBeFalse();
expect(Post::where('title', 'b')->first()->isPublished())->toBeTrue();
expect(Post::current()->count())->toBe(1);
});