getScoutKeyName must return field name without table prefix

Author: babenkoivan

src/ElasticEngine.php

@@ -295,24 +295,24 @@ public function map(Builder $builder, $results, $model)
             return Collection::make();
         }
 
-        $primaryKey = $model->getKeyName();
+        $scoutKeyName = $model->getScoutKeyName();
 
         $columns = Arr::get($results, '_payload.body._source');
 
         if (is_null($columns)) {
             $columns = ['*'];
         } else {
-            $columns[] = $primaryKey;
+            $columns[] = $scoutKeyName;
         }
 
         $ids = $this->mapIds($results)->all();
 
         $query = $model::usesSoftDelete() ? $model->withTrashed() : $model->newQuery();
 
         $models = $query
-            ->whereIn($primaryKey, $ids)
+            ->whereIn($scoutKeyName, $ids)
             ->get($columns)
-            ->keyBy($primaryKey);
+            ->keyBy($scoutKeyName);
 
         return Collection::make($results['hits']['hits'])
             ->map(function ($hit) use ($models) {
@@ -348,7 +348,7 @@ public function flush($model)
         $query = $model::usesSoftDelete() ? $model->withTrashed() : $model->newQuery();
 
         $query
-            ->orderBy($model->getKeyName())
+            ->orderBy($model->getScoutKeyName())
             ->unsearchable();
     }
 }

src/Searchable.php

@@ -6,12 +6,13 @@
 use Illuminate\Support\Arr;
 use ScoutElastic\Builders\FilterBuilder;
 use ScoutElastic\Builders\SearchBuilder;
-use Laravel\Scout\Searchable as ScoutSearchable;
+use Laravel\Scout\Searchable as SourceSearchable;
 
 trait Searchable
 {
-    use ScoutSearchable {
-        ScoutSearchable::bootSearchable as bootScoutSearchable;
+    use SourceSearchable {
+        SourceSearchable::bootSearchable as sourceBootSearchable;
+        SourceSearchable::getScoutKeyName as sourceGetScoutKeyName;
     }
 
     /**
@@ -34,7 +35,7 @@ public static function bootSearchable()
             return;
         }
 
-        self::bootScoutSearchable();
+        self::sourceBootSearchable();
 
         self::$isSearchableTraitBooted = true;
     }
@@ -49,8 +50,8 @@ public function getIndexConfigurator()
     {
         static $indexConfigurator;
 
-        if (! $indexConfigurator) {
-            if (! isset($this->indexConfigurator) || empty($this->indexConfigurator)) {
+        if (!$indexConfigurator) {
+            if (!isset($this->indexConfigurator) || empty($this->indexConfigurator)) {
                 throw new Exception(sprintf(
                     'An index configurator for the %s model is not specified.',
                     __CLASS__
@@ -143,4 +144,14 @@ public function getHighlightAttribute()
     {
         return $this->highlight;
     }
+
+    /**
+     * Get the key name used to index the model.
+     *
+     * @return mixed
+     */
+    public function getScoutKeyName()
+    {
+        return $this->getKeyName();
+    }
 }