Merge pull request #155 from mozammil/fix-154

Fixes 154 whereby _rankingInfo and _highlightResult were being indexed.

src/Jobs/UpdateJob.php

@@ -18,11 +18,13 @@
 use function is_array;
 use function get_class;
 use function is_string;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use Algolia\AlgoliaSearch\SearchClient;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Algolia\ScoutExtended\Searchable\ModelsResolver;
 use Algolia\ScoutExtended\Contracts\SplitterContract;
 use Algolia\ScoutExtended\Searchable\ObjectIdEncrypter;
 use Algolia\ScoutExtended\Transformers\ConvertDatesToTimestamps;
@@ -102,7 +104,9 @@ public function handle(SearchClient $client): void
         $searchablesToDelete = [];
 
         foreach ($this->searchables as $key => $searchable) {
-            if (empty($array = array_merge($searchable->toSearchableArray(), $searchable->scoutMetadata()))) {
+            $metadata = Arr::except($searchable->scoutMetadata(), ModelsResolver::$metadata);
+
+            if (empty($array = array_merge($searchable->toSearchableArray(), $metadata))) {
                 continue;
             }
 

src/Searchable/ModelsResolver.php

@@ -29,7 +29,7 @@ final class ModelsResolver
     /**
      * @var string[]
      */
-    private static $metadata = [
+    public static $metadata = [
         '_highlightResult',
         '_rankingInfo',
     ];

tests/Features/SearchableTest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Features;
+
+use Mockery;
+use App\User;
+use Tests\TestCase;
+use Illuminate\Support\Arr;
+use Algolia\ScoutExtended\Searchable\ModelsResolver;
+
+final class SearchableTest extends TestCase
+{
+    public function testSearchable(): void
+    {
+        $user = factory(User::class)->create();
+
+        $user->withScoutMetaData('_rankingInfo', []);
+        $user->withScoutMetaData('_highlightResult', []);
+
+        $metadataKeys = ModelsResolver::$metadata;
+
+        $usersIndex = $this->mockIndex(User::class);
+        $usersIndex->expects('saveObjects')->once()->with(Mockery::on(function ($argument) use ($metadataKeys) {
+            return count(Arr::only($argument[0], $metadataKeys)) === 0;
+        }));
+
+        $user->searchable();
+    }
+}