Merge 2106d71 into 4770e96

umbrellio · Aug 7, 2023 · 49b0f1f · 49b0f1f
2 parents 4770e96 + 2106d71
commit 49b0f1f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/src/Integration/Laravel/Contracts/SyncableModel.php b/src/Integration/Laravel/Contracts/SyncableModel.php
@@ -7,37 +7,42 @@
 interface SyncableModel
 {
     /**
-     * @var string
+     * @return string
      */
     public function getKeyName();
 
     /**
-     * @var string
+     * @return string
      */
     public function getKey();
 
     /**
-     * @var static|null
+     * @return static|null
      */
     public function fresh();
 
     /**
-     * @var array
+     * @return array
      */
     public function getTableSyncableAttributes();
 
     /**
-     * @var string
+     * @return array
+     */
+    public function getTableSyncableDeletedAttributes();
+
+    /**
+     * @return string
      */
     public function classForSync();
 
     /**
-     * @var bool
+     * @return bool
      */
     public function exists();
 
     /**
-     * @var string
+     * @return string
      */
     public function routingKey();
 }
diff --git a/src/Integration/Laravel/Syncer.php b/src/Integration/Laravel/Syncer.php
@@ -48,11 +48,11 @@ private function syncTable(SyncableModel $model, string $event): void
 
     private function getSyncableAttributes(SyncableModel $model): array
     {
-        if (!$model->exists()) {
-            return $this->pkAttributes($model);
-        }
+        $syncableAttributes = $model->exists() ?
+            $model->getTableSyncableAttributes() :
+            $model->getTableSyncableDeletedAttributes();
 
-        return array_merge($this->pkAttributes($model), $model->getTableSyncableAttributes());
+        return array_merge($this->pkAttributes($model), $syncableAttributes);
     }
 
     private function needsPublishAttributes(SyncableModel $model, array $attributes): bool

diff --git a/src/Integration/Laravel/TableSyncable.php b/src/Integration/Laravel/TableSyncable.php
@@ -20,6 +20,11 @@ public function getTableSyncableAttributes(): array
         return $this->getAttributes();
     }
 
+    public function getTableSyncableDeletedAttributes(): array
+    {
+        return [];
+    }
+
     public function classForSync(): string
     {
         return static::class;

diff --git a/tests/functional/Laravel/Integration/Publishers/EnsureConsistencyPublisherTest.php b/tests/functional/Laravel/Integration/Publishers/EnsureConsistencyPublisherTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->spyPublisher = $this->makeSpyPublsiher();
+        $this->spyPublisher = $this->makeSpyPublisher();
 
         $this->app->bind(Publisher::class, function () {
             return $this->spyPublisher;

diff --git a/tests/functional/Laravel/Integration/TableSyncObserverTest.php b/tests/functional/Laravel/Integration/TableSyncObserverTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->spyPublisher = $this->makeSpyPublsiher();
+        $this->spyPublisher = $this->makeSpyPublisher();
 
         $this->app->bind(Publisher::class, function () {
             return $this->spyPublisher;

diff --git a/tests/functional/Laravel/Traits/SpyPublisher.php b/tests/functional/Laravel/Traits/SpyPublisher.php
@@ -9,7 +9,7 @@
 
 trait SpyPublisher
 {
-    protected function makeSpyPublsiher(): Publisher
+    protected function makeSpyPublisher(): Publisher
     {
         return new class() implements Publisher {
             public $messages;