Allow specification of elements other than body

babenkoivan · Apr 19, 2020 · 4191b65 · 4191b65
1 parent 6844679
commit 4191b65
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 1 deletion.
diff --git a/src/Indexers/SingleIndexer.php b/src/Indexers/SingleIndexer.php
@@ -19,9 +19,19 @@ public function update(Collection $models)
                 $model->pushSoftDeleteMetadata();
             }
 
+            $scoutMetaBody = [];
+            $scoutMetaOther = [];
+            foreach ($model->scoutMetadata() as $k => $v) {
+                if (is_string($k) && substr($k, 0, 1) === '_') {
+                    $scoutMetaOther[substr($k, 1)] = $v;
+                } else {
+                    $scoutMetaBody[$k] = $v;
+                }
+            }
+
             $modelData = array_merge(
                 $model->toSearchableArray(),
-                $model->scoutMetadata()
+                $scoutMetaBody
             );
 
             if (empty($modelData)) {
@@ -32,6 +42,9 @@ public function update(Collection $models)
 
             $payload = (new DocumentPayload($model))
                 ->set('body', $modelData);
+            foreach ($scoutMetaOther as $k => $v) {
+                $payload->set($k, $v);
+            }
 
             if (in_array(Migratable::class, class_uses_recursive($indexConfigurator))) {
                 $payload->useAlias('write');

diff --git a/tests/Dependencies/Model.php b/tests/Dependencies/Model.php
@@ -52,6 +52,10 @@ public function mockModel(array $params = [])
             ->method('toSearchableArray')
             ->willReturn($params['searchable_array'] ?? []);
 
+        $mock
+            ->method('scoutMetadata')
+            ->willReturn($params['scoutMetadata'] ?? []);
+
         $mock
             ->method('getIndexConfigurator')
             ->willReturn($params['index_configurator'] ?? $this->mockIndexConfigurator());

diff --git a/tests/Indexers/AbstractIndexerTest.php b/tests/Indexers/AbstractIndexerTest.php
@@ -37,6 +37,14 @@ protected function setUp()
                 'trashed' => false,
                 'searchable_array' => [],
             ]),
+            $this->mockModel([
+                'key' => 4,
+                'trashed' => false,
+                'scoutMetadata' => [
+                    'name' => 'bar',
+                    '_routing' => 'woo',
+                ],
+            ])
         ]);
     }
 }
diff --git a/tests/Indexers/SingleIndexerTest.php b/tests/Indexers/SingleIndexerTest.php
@@ -32,6 +32,17 @@ public function testUpdateWithDisabledSoftDelete()
                 'body' => [
                     'name' => 'bar',
                 ],
+            ])
+            ->shouldReceive('index')
+            ->once()
+            ->with([
+                'index' => 'test',
+                'type' => 'test',
+                'id' => 4,
+                'body' => [
+                    'name' => 'bar',
+                ],
+                'routing' => 'woo',
             ]);
 
         (new SingleIndexer)
@@ -76,6 +87,18 @@ public function testUpdateWithEnabledSoftDelete()
                 'body' => [
                     '__soft_deleted' => 0,
                 ],
+            ])
+            ->shouldReceive('index')
+            ->once()
+            ->with([
+                'index' => 'test',
+                'type' => 'test',
+                'id' => 4,
+                'body' => [
+                    'name' => 'bar',
+                    '__soft_deleted' => 0,
+                ],
+                'routing' => 'woo',
             ]);
 
         (new SingleIndexer)
@@ -110,6 +133,17 @@ public function testUpdateWithSpecifiedDocumentRefreshOption()
                 'body' => [
                     'name' => 'bar',
                 ],
+            ])
+            ->shouldReceive('index')
+            ->once()
+            ->with([
+                'index' => 'test',
+                'type' => 'test',
+                'id' => 4,
+                'body' => [
+                    'name' => 'bar',
+                ],
+                'routing' => 'woo',
             ]);
 
         (new SingleIndexer)
@@ -150,6 +184,16 @@ public function testDelete()
                 'client' => [
                     'ignore' => 404,
                 ],
+            ])
+            ->shouldReceive('delete')
+            ->once()
+            ->with([
+                'index' => 'test',
+                'type' => 'test',
+                'id' => 4,
+                'client' => [
+                    'ignore' => 404,
+                ],
             ]);
 
         (new SingleIndexer)
@@ -195,6 +239,17 @@ public function testDeleteWithSpecifiedDocumentRefreshOption()
                 'client' => [
                     'ignore' => 404,
                 ],
+            ])
+            ->shouldReceive('delete')
+            ->once()
+            ->with([
+                'index' => 'test',
+                'type' => 'test',
+                'id' => 2,
+                'refresh' => true,
+                'client' => [
+                    'ignore' => 404,
+                ],
             ]);
 
         (new SingleIndexer())