allow disabling database attribute hydration

Author: IlmLV

src/ElasticEngine.php

@@ -295,24 +295,7 @@ public function map(Builder $builder, $results, $model)
             return Collection::make();
         }
 
-        $scoutKeyName = $model->getScoutKeyName();
-
-        $columns = Arr::get($results, '_payload.body._source');
-
-        if (is_null($columns)) {
-            $columns = ['*'];
-        } else {
-            $columns[] = $scoutKeyName;
-        }
-
-        $ids = $this->mapIds($results)->all();
-
-        $query = $model::usesSoftDelete() ? $model->withTrashed() : $model->newQuery();
-
-        $models = $query
-            ->whereIn($scoutKeyName, $ids)
-            ->get($columns)
-            ->keyBy($scoutKeyName);
+        $models = $this->hydrateModels($model, $results);
 
         return Collection::make($results['hits']['hits'])
             ->map(function ($hit) use ($models) {
@@ -332,6 +315,49 @@ public function map(Builder $builder, $results, $model)
             ->values();
     }
 
+    /**
+     * @param $model
+     * @param $results
+     * @return Collection
+     */
+    public function hydrateModels($model, $results)
+    {
+        // Hydrate models from elastic index
+        if ($model->databaseHydrate === false) {
+            $hits = collect($results['hits']['hits']);
+            $className = get_class($model);
+            $models = new Collection();
+
+            $hits->each(function ($item, $key) use ($className, $model, $models) {
+                $attributes = $item['_source'];
+                $models->put($item['_id'], new $className($attributes));
+            });
+        }
+        // Hydrate models from database
+        else {
+            $scoutKeyName = $model->getScoutKeyName();
+
+            $columns = Arr::get($results, '_payload.body._source');
+
+            if (is_null($columns)) {
+                $columns = ['*'];
+            } else {
+                $columns[] = $scoutKeyName;
+            }
+
+            $ids = $this->mapIds($results)->all();
+
+            $query = $model::usesSoftDelete() ? $model->withTrashed() : $model->newQuery();
+
+            $models = $query
+                ->whereIn($scoutKeyName, $ids)
+                ->get($columns)
+                ->keyBy($scoutKeyName);
+        }
+
+        return $models;
+    }
+
     /**
      * {@inheritdoc}
      */