Fix AggregatorObserver sync status

Author: qmeister

src/Searchable/AggregatorObserver.php

@@ -85,10 +85,6 @@ public function saved($model): void
      */
     public function deleted($model): void
     {
-        if (static::syncingDisabledFor($model)) {
-            return;
-        }
-
         if ($this->usesSoftDelete($model) && config('scout.soft_delete', false)) {
             $this->saved($model);
         } else {
@@ -112,10 +108,6 @@ public function deleted($model): void
      */
     public function forceDeleted($model): void
     {
-        if (static::syncingDisabledFor($model)) {
-            return;
-        }
-
         $class = get_class($model);
 
         if (! array_key_exists($class, $this->aggregators)) {

tests/Features/AggregatorTest.php

@@ -15,6 +15,7 @@
 use App\Thread;
 use App\User;
 use App\Wall;
+use Laravel\Scout\ModelObserver;
 use Laravel\Scout\Scout;
 use Mockery;
 use RuntimeException;
@@ -582,6 +583,115 @@ public function testWhenAggregatorIsBootedBeforePlainScoutSearchableTrait(): voi
 
         $user->delete();
     }
+
+    public function testSkipDeletedWhenDisableSyncingFor(): void
+    {
+        $this->app['config']->set('scout.algolia.use_deprecated_delete_by', false);
+
+        $wallIndexMock = $this->mockIndex('wall');
+        $usersIndexMock = $this->mockIndex('users');
+
+        $usersIndexMock->shouldReceive('saveObjects')->once();
+
+        $user = factory(User::class)->create();
+
+        ModelObserver::disableSyncingFor(User::class);
+
+        Wall::bootSearchable();
+
+        try {
+            // Expect browseObjects and deleteObjects to be called on the wall index
+            $wallIndexMock->shouldReceive('browseObjects')->once()->with([
+                'attributesToRetrieve' => ['objectID'],
+                'tagFilters' => [['App\User::1']],
+            ])->andReturn([['objectID' => 'App\User::1']]);
+            $wallIndexMock->shouldReceive('deleteObjects')->once()->with(['App\User::1']);
+
+            // Ensure browseObjects and deleteObjects are NOT called on the users index
+            $usersIndexMock->shouldNotReceive('browseObjects')->with([
+                'attributesToRetrieve' => ['objectID'],
+                'tagFilters' => [['App\User::1']],
+            ])->andReturn([['objectID' => 'App\User::1']]);
+            $usersIndexMock->shouldNotReceive('deleteObjects')->with(['App\User::1']);
+
+            $user->delete();
+        } finally {
+            ModelObserver::enableSyncingFor(User::class);
+        }
+    }
+
+    public function testSkipForceDeletedWhenDisableSyncingFor(): void
+    {
+        $this->app['config']->set('scout.algolia.use_deprecated_delete_by', false);
+
+        $wallIndexMock = $this->mockIndex('wall');
+        $usersIndexMock = $this->mockIndex('users');
+
+        $usersIndexMock->shouldReceive('saveObjects')->once();
+        $user = factory(User::class)->create();
+
+        ModelObserver::disableSyncingFor(User::class);
+
+        Wall::bootSearchable();
+
+        try {
+            // Expect browseObjects and deleteObjects to be called on the wall index
+            $wallIndexMock->shouldReceive('browseObjects')->once()->with([
+                'attributesToRetrieve' => ['objectID',],
+                'tagFilters' => [['App\User::1'],],
+            ])->andReturn([['objectID' => 'App\User::1']]);
+            $wallIndexMock->shouldReceive('deleteObjects')->once()->with(['App\User::1']);
+
+            // Ensure browseObjects and deleteObjects are NOT called on the users index
+            $usersIndexMock->shouldNotReceive('browseObjects')->with([
+                'attributesToRetrieve' => ['objectID'],
+                'tagFilters' => [['App\User::1']],
+            ])->andReturn([['objectID' => 'App\User::1']]);
+            $usersIndexMock->shouldNotReceive('deleteObjects')->with(['App\User::1']);
+
+            $user->forceDelete();
+
+            ModelObserver::enableSyncingFor(User::class);
+        } finally {
+            // Ensure that the ModelObserver is re-enabled even if an exception occurs
+            ModelObserver::enableSyncingFor(User::class);
+        }
+    }
+
+    public function testSkipSavedWhenDisableSyncingFor(): void
+    {
+        $wallIndexMock = $this->mockIndex('wall');
+        $usersIndexMock = $this->mockIndex('users');
+
+        $usersIndexMock->shouldReceive('saveObjects')->once();
+
+        $user = factory(User::class)->create();
+
+        ModelObserver::disableSyncingFor(User::class);
+
+        try {
+            // Expect saveObjects to be called once for the wall index
+            $wallIndexMock->shouldReceive('saveObjects')
+                ->once()
+                ->with(Mockery::on(function ($argument) {
+                    return count($argument) === 1 && array_key_exists('email', $argument[0]) &&
+                        $argument[0]['objectID'] === 'App\User::1';
+                }));
+
+            // Ensure saveObjects is NOT called for the users index
+            $usersIndexMock->shouldNotReceive('saveObjects')
+                ->with(Mockery::on(function ($argument) {
+                    return count($argument) === 1 && array_key_exists('email', $argument[0]) &&
+                        $argument[0]['objectID'] === 'App\User::1';
+                }));
+
+            Wall::bootSearchable();
+
+            $user->save();
+        } finally {
+            ModelObserver::enableSyncingFor(User::class);
+        }
+    }
 }
 
 class DummyRemoveFromSearch {