Merge pull request #2 from Ibra1994/feature/aggregation

custom scout key

Author: alexkovt

src/ElasticEngine.php

@@ -306,7 +306,10 @@ public function map(Builder $builder, $results, $model)
             $columns[] = $scoutKeyName;
         }
 
-        $ids = $this->mapIds($results)->all();
+        $ids = [];
+        foreach ($results['hits']['hits'] as $hit) {
+            $ids[] = $hit['_source'][$scoutKeyName];
+        }
 
         $query = $model::usesSoftDelete() ? $model->withTrashed() : $model->newQuery();
 
@@ -316,8 +319,8 @@ public function map(Builder $builder, $results, $model)
             ->keyBy($scoutKeyName);
 
         return Collection::make($results['hits']['hits'])
-            ->map(function ($hit) use ($models) {
-                $id = $hit['_id'];
+            ->map(function ($hit) use ($models, $scoutKeyName) {
+                $id = $hit['_source'][$scoutKeyName];
 
                 if (isset($models[$id])) {
                     $model = $models[$id];