Fixed bulk indexing url and payload size.

Author: babenkoivan

src/Indexers/BulkIndexer.php

@@ -6,12 +6,20 @@
 use ScoutElastic\Facades\ElasticClient;
 use ScoutElastic\Migratable;
 use ScoutElastic\Payloads\RawPayload;
+use ScoutElastic\Payloads\TypePayload;
 
 class BulkIndexer implements IndexerInterface
 {
     public function update(Collection $models)
     {
-        $bulkPayload = new RawPayload();
+        $model = $models->first();
+        $indexConfigurator = $model->getIndexConfigurator();
+
+        $bulkPayload = new TypePayload($model);
+
+        if (in_array(Migratable::class, class_uses_recursive($indexConfigurator))) {
+            $bulkPayload->useAlias('write');
+        }
 
         $models->each(function ($model) use ($bulkPayload) {
             $modelData = $model->toSearchableArray();
@@ -20,19 +28,11 @@ public function update(Collection $models)
                 return true;
             }
 
-            $indexConfigurator = $model->getIndexConfigurator();
-
             $actionPayload = (new RawPayload())
-                ->set('index._type', $model->searchableAs())
                 ->set('index._id', $model->getKey());
 
-            if (in_array(Migratable::class, class_uses_recursive($indexConfigurator))) {
-                $actionPayload->set('index._index', $indexConfigurator->getWriteAlias());
-            } else {
-                $actionPayload->set('index._index', $indexConfigurator->getName());
-            }
-
-            $bulkPayload->add('body', $actionPayload->get())
+            $bulkPayload
+                ->add('body', $actionPayload->get())
                 ->add('body', $modelData);
         });
 
@@ -41,14 +41,12 @@ public function update(Collection $models)
 
     public function delete(Collection $models)
     {
-        $bulkPayload = new RawPayload();
+        $model = $models->first();
 
-        $models->each(function ($model) use ($bulkPayload) {
-            $indexConfigurator = $model->getIndexConfigurator();
+        $bulkPayload = new TypePayload($model);
 
+        $models->each(function ($model) use ($bulkPayload) {
             $actionPayload = (new RawPayload())
-                ->set('delete._index', $indexConfigurator->getName())
-                ->set('delete._type', $model->searchableAs())
                 ->set('delete._id', $model->getKey());
 
             $bulkPayload->add('body', $actionPayload->get());

src/Payloads/RawPayload.php

@@ -24,6 +24,11 @@ public function setIfNotEmpty($key, $value)
         return $this->set($key, $value);
     }
 
+    public function has($key)
+    {
+        return array_has($this->payload, $key);
+    }
+
     public function add($key, $value)
     {
         if (!is_null($key)) {

tests/ElasticEngineTest.php

@@ -78,11 +78,11 @@ public function test_if_the_update_method_with_bulk_indexer_builds_correct_paylo
         $this->mockClient()
             ->shouldReceive('bulk')
             ->with([
+                'index' => 'test_index_write',
+                'type' => 'test_table',
                 'body' => [
                     [
                         'index' => [
-                            '_index' => 'test_index_write',
-                            '_type' => 'test_table',
                             '_id' => 1
                         ]
                     ],
@@ -109,11 +109,11 @@ public function test_if_the_delete_method_with_bulk_indexer_builds_correct_paylo
         $this->mockClient()
             ->shouldReceive('bulk')
             ->with([
+                'index' => 'test_index',
+                'type' => 'test_table',
                 'body' => [
                     [
                         'delete' => [
-                            '_index' => 'test_index',
-                            '_type' => 'test_table',
                             '_id' => 1
                         ]
                     ]