Merge pull request #27 from designmynight/document-type-global-scope

Fix indexing
designmynight · Jan 30, 2018 · 8ac0df8 · 8ac0df8
2 parents 5663a05 + 5a5107d
commit 8ac0df8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/DesignMyNight/Elasticsearch/EloquentBuilder.php b/src/DesignMyNight/Elasticsearch/EloquentBuilder.php
@@ -25,7 +25,7 @@ public function setModel(Model $model)
 
         $this->query->from($model->getSearchIndex());
 
-        $this->query->whereType($model->getSearchType());
+        $this->query->type($model->getSearchType());
 
         return $this;
     }

diff --git a/src/DesignMyNight/Elasticsearch/Searchable.php b/src/DesignMyNight/Elasticsearch/Searchable.php
@@ -3,6 +3,7 @@
 namespace DesignMyNight\Elasticsearch;
 
 trait Searchable {
+
     public static function getElasticsearchConnectionName(): string
     {
         return 'elasticsearch';
@@ -127,6 +128,8 @@ public static function newElasticsearchQuery(): EloquentBuilder
     {
         $model = new static();
 
-        return $model->on(static::getElasticsearchConnectionName())->setModel($model);
+        return $model
+            ->on(static::getElasticsearchConnectionName())
+            ->whereType($model->getSearchType());
     }
-}
+}