Fix publish method when called on a draft

Author: oddvalue

src/Concerns/HasDrafts.php

@@ -37,13 +37,14 @@ public function initializeHasDrafts()
     {
         $this->mergeCasts([
             $this->getIsCurrentColumn() => 'boolean',
+            $this->getIsPublishedColumn() => 'boolean',
             $this->getPublishedAtColumn() => 'datetime',
         ]);
     }
 
     public static function bootHasDrafts(): void
     {
-        static::creating(function ($model) {
+        static::creating(function (Model $model): void {
             $model->{$model->getIsCurrentColumn()} = true;
             $model->setPublisher();
             $model->generateUuid();
@@ -52,26 +53,32 @@ public static function bootHasDrafts(): void
             }
         });
 
-        static::updating(function ($model) {
+        static::updating(function (Model $model): void {
             $model->newRevision();
         });
 
-        static::publishing(function ($model) {
+        static::publishing(function (Model $model): bool {
             $model->setLive();
+
+            static::saved(function (Model $model): void {
+                $model->fireModelEvent('published');
+            });
+
+            return false;
         });
 
-        static::deleted(function ($model) {
+        static::deleted(function (Model $model): void {
             $model->revisions()->delete();
         });
 
         if (method_exists(static::class, 'restored')) {
-            static::restored(function ($model) {
+            static::restored(function (Model $model): void {
                 $model->revisions()->restore();
             });
         }
 
         if (method_exists(static::class, 'forceDeleted')) {
-            static::forceDeleted(function ($model) {
+            static::forceDeleted(function (Model $model): void {
                 $model->revisions()->forceDelete();
             });
         }

src/Concerns/Publishes.php

@@ -49,8 +49,8 @@ public function publish(): static
         $this->{$this->getPublishedAtColumn()} ??= now();
         $this->{$this->getIsPublishedColumn()} = true;
 
-        static::saved(function (Model $record): void {
-            if ($record->getKey() !== $this->getKey()) {
+        static::saved(function (Model $model): void {
+            if ($model->is($this)) {
                 return;
             }
 

tests/PublishingTest.php

@@ -39,7 +39,8 @@
 it('can use `withDrafts` scope to select drafts', function () {
     Post::factory()->count(5)->published()->create();
     Post::factory()->count(5)->draft()->create();
-    $this->assertCount(10, Post::withDrafts()->get());
+    expect(Post::withDrafts()->pluck('id'))
+        ->toHaveCount(10);
 });
 
 it('generates a uuid', function () {
@@ -54,3 +55,14 @@
     $post = Post::factory()->draft()->create();
     expect($post->isPublished())->toBeFalse();
 });
+
+it('does not create multiple published records', function () {
+    $post = Post::factory()->create();
+    $post->title = 'b';
+    $post->saveAsDraft();
+    $post->draft->publish()->save();
+    expect(Post::withDrafts()->pluck('id'))
+        ->toHaveCount(2);
+    expect(Post::withoutDrafts()->pluck('id'))
+        ->toHaveCount(1);
+});