refactor: toSearchableArray now sets search connection

designmynight · Jan 27, 2019 · 1301e74 · 1301e74
1 parent 3ebca18
commit 1301e74
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/Collection.php b/src/Collection.php
@@ -13,17 +13,17 @@ public function addToIndex()
         }
 
         $instance = $this->first();
+        $instance->setConnection($instance->getElasticsearchConnectionName());
+        $query = $this->first()->newQueryWithoutScopes();
 
-        return $instance->onSearchConnection(function ($instance) {
-            $docs = $this->map(function ($model) {
-                return $model->onSearchConnection(function ($model) {
-                    return $model->toSearchableArray();
-                }, $model);
-            });
+        $docs = $this->map(function ($model, $i) {
+            return $model->toSearchableArray();
+        });
 
-            $query = $instance->newQueryWithoutScopes();
+        $success = $query->insert($docs->all());
 
-            return $query->insert($docs->all());
-        }, $instance);
+        unset($docs);
+
+        return $success;
     }
 }