Fix issues for users providing searchable array without primary key (l…

…aravel#547)
bobmulder · Nov 11, 2021 · 5e7a5db · 5e7a5db
1 parent ad96177
commit 5e7a5db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Engines/MeiliSearchEngine.php b/src/Engines/MeiliSearchEngine.php
@@ -62,7 +62,11 @@ public function update($models)
                 return;
             }
 
-            return array_merge($searchableData, $model->scoutMetadata());
+            return array_merge(
+                [$model->getKeyName() => $model->getScoutKey()],
+                $searchableData,
+                $model->scoutMetadata()
+            );
         })->filter()->values()->all();
 
         if (! empty($objects)) {

diff --git a/tests/Unit/MeiliSearchEngineTest.php b/tests/Unit/MeiliSearchEngineTest.php
@@ -275,10 +275,12 @@ public function test_a_model_is_indexed_with_a_custom_meilisearch_key()
     {
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->with('table')->andReturn($index = m::mock(Indexes::class));
-        $index->shouldReceive('addDocuments')->with([['id' => 'my-meilisearch-key.1']], 'id');
+        $index->shouldReceive('addDocuments')->once()->with([[
+            'id' => 5,
+        ]], 'id');
 
         $engine = new MeiliSearchEngine($client);
-        $engine->update(Collection::make([new MeiliSearchCustomKeySearchableModel()]));
+        $engine->update(Collection::make([new MeiliSearchCustomKeySearchableModel(['id' => 5])]));
     }
 
     public function test_flush_a_model_with_a_custom_meilisearch_key()