Merge pull request #109 from hotwired-laravel/fix-not-broadcasting-when-using-model-touching

Fix model broadcast was not being triggered when using model touching

Author: tonysm

src/Models/ModelObserver.php

@@ -21,25 +21,17 @@ public function __construct()
     /**
      * @param Model|Broadcasts $model
      */
-    public function created(Model $model)
+    public function saved(Model $model)
     {
         if (! $this->shouldBroadcast($model)) {
             return;
         }
 
-        $model->broadcastInsert()->later();
-    }
-
-    /**
-     * @param Model|Broadcasts $model
-     */
-    public function updated(Model $model)
-    {
-        if (! $this->shouldBroadcast($model)) {
-            return;
+        if ($model->wasRecentlyCreated) {
+            $model->broadcastInsert()->later();
+        } else {
+            $model->broadcastReplace()->later();
         }
-
-        $model->broadcastReplace()->later();
     }
 
     /**

tests/Models/BroadcastsModelTest.php

@@ -3,7 +3,9 @@
 namespace Tonysm\TurboLaravel\Tests\Models;
 
 use Illuminate\Broadcasting\Channel;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\View;
 use Tonysm\TurboLaravel\Broadcasting\PendingBroadcast;
 use Tonysm\TurboLaravel\Facades\TurboStream;
 use Tonysm\TurboLaravel\Jobs\BroadcastAction;
@@ -17,6 +19,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        View::addLocation(__DIR__ . '/../Stubs/views');
+
         config(['turbo-laravel.queue' => false]);
     }
 
@@ -436,6 +440,43 @@ public function using_the_new_broadcast_fake()
             return true;
         });
     }
+
+    /** @test */
+    public function broadcasts_on_model_touching()
+    {
+        TurboStream::fake();
+
+        $oldUpdatedAt = now()->subDays(10);
+
+        $post = Post::withoutEvents(fn () => Post::forceCreate([
+            'title' => 'Testing Model Touching',
+            'updated_at' => $oldUpdatedAt,
+        ]));
+
+        $this->assertTrue($post->fresh()->updated_at->isSameDay($oldUpdatedAt));
+        TurboStream::assertNothingWasBroadcasted();
+
+        $post->fresh()->comments()->create([
+            'body' => 'Hello World',
+        ]);
+
+        // Must have updated the parent timestamps...
+        $this->assertFalse($post->fresh()->updated_at->isSameDay($oldUpdatedAt));
+
+        TurboStream::assertBroadcasted(function (PendingBroadcast $broadcast) use ($post) {
+            $this->assertCount(1, $broadcast->channels);
+            $this->assertEquals('private-' . $post->broadcastChannel(), $broadcast->channels[0]->name);
+            $this->assertEquals(dom_id($post), $broadcast->target);
+            $this->assertNull($broadcast->targets);
+            $this->assertEquals('replace', $broadcast->action);
+            $this->assertEquals('posts._post', $broadcast->partialView);
+            $this->assertCount(1, $broadcast->partialData);
+            $this->assertArrayHasKey('post', $broadcast->partialData);
+            $this->assertTrue($post->is($broadcast->partialData['post']));
+
+            return true;
+        });
+    }
 }
 
 class BroadcastTestModel extends TestModel
@@ -525,3 +566,29 @@ public function parent()
         return $this->belongsTo(RelatedModelParent::class);
     }
 }
+
+class Post extends Model
+{
+    use Broadcasts;
+
+    protected $guarded = [];
+
+    protected $broadcasts = ['insertsBy' => 'prepend'];
+
+    public function comments()
+    {
+        return $this->hasMany(Comment::class);
+    }
+}
+
+class Comment extends Model
+{
+    protected $guarded = [];
+
+    protected $touches = ['post'];
+
+    public function post()
+    {
+        return $this->belongsTo(Post::class);
+    }
+}

tests/Stubs/views/posts/_post.blade.php

@@ -0,0 +1 @@
+<div>{{ $post->title }}</div>

tests/TestCase.php

@@ -45,5 +45,19 @@ private function setUpDatabase(Application $app): void
             $table->timestamps();
             $table->softDeletes();
         });
+
+        $app['db']->connection()->getSchemaBuilder()->create('posts', function (Blueprint $table) {
+            $table->id();
+            $table->string('title');
+            $table->text('body')->nullable();
+            $table->timestamps();
+        });
+
+        $app['db']->connection()->getSchemaBuilder()->create('comments', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('post_id');
+            $table->text('body');
+            $table->timestamps();
+        });
     }
 }