Added support for dynamic indices

Author: pdphilip

src/DSL/Bridge.php

@@ -113,11 +113,6 @@ public function processGet($ids, $columns): Results
 
     public function processFind($wheres, $options, $columns): Results
     {
-//        if (count($wheres) == 1) {
-//            if (!empty($wheres['_id'])) {
-//                return $this->processGet($wheres['_id'], $columns);
-//            }
-//        }
         $params = $this->buildParams($this->index, $wheres, $options, $columns);
 
         return $this->_returnSearch($params, __FUNCTION__);
@@ -196,7 +191,9 @@ public function processSave($data, $refresh): Results
             $id = $data['_id'];
             unset($data['_id']);
         }
-//        $data = $this->cleanData($data);
+        if (isset($data['_index'])) {
+            unset($data['_index']);
+        }
         $params = [
             'index' => $this->index,
             'body'  => $data,
@@ -619,6 +616,7 @@ private function _sanitizeSearchResponse($response, $params, $queryTag)
         if (!empty($response['hits']['hits'])) {
             foreach ($response['hits']['hits'] as $hit) {
                 $datum = [];
+                $datum['_index'] = $hit['_index'];
                 $datum['_id'] = $hit['_id'];
                 if (!empty($hit['_source'])) {
                     foreach ($hit['_source'] as $key => $value) {

src/DSL/QueryBuilder.php

@@ -173,8 +173,7 @@ private static function _ninQueryString($key, $values): string
 
     private static function _parseParams($key, $value): string
     {
-
-        if ($key == 'and' || $key == 'or') {
+        if ($key === 'and' || $key === 'or') {
             return self::{'_'.$key.'QueryString'}($value);
         }
         if (is_array($value)) {

src/Eloquent/Builder.php

@@ -3,6 +3,8 @@
 namespace PDPhilip\Elasticsearch\Eloquent;
 
 use Illuminate\Database\Eloquent\Builder as BaseEloquentBuilder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 use PDPhilip\Elasticsearch\Helpers\QueriesRelationships;
 
 class Builder extends BaseEloquentBuilder
@@ -354,4 +356,29 @@ public function fields(array $fields)
         return $this;
     }
 
+    public function hydrate(array $items)
+    {
+        $instance = $this->newModelInstance();
+
+        return $instance->newCollection(array_map(function ($item) use ($instance) {
+            $recordIndex = null;
+            if (is_array($item)) {
+                $recordIndex = !empty($item['_index']) ? $item['_index'] : null;
+                if ($recordIndex) {
+                    unset($item['_index']);
+                }
+            }
+
+            $model = $instance->newFromBuilder($item);
+            if ($recordIndex) {
+                $model->setRecordIndex($recordIndex);
+                $model->setIndex($recordIndex);
+
+            }
+
+            return $model;
+
+        }, $items));
+    }
+
 }

src/Eloquent/Model.php

@@ -21,6 +21,8 @@ abstract class Model extends BaseModel
 
     protected $index;
 
+    protected $recordIndex;
+
     protected $primaryKey = '_id';
 
     protected $keyType = 'string';
@@ -32,12 +34,16 @@ public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
         $this->setIndex();
+        $this->setRecordIndex();
         $this->forcePrimaryKey();
     }
 
 
-    public function setIndex()
+    public function setIndex($index = null)
     {
+        if ($index) {
+            return $this->index = $index;
+        }
         $this->index = $this->index ?? $this->getTable();
         unset($this->table);
     }
@@ -50,6 +56,20 @@ public function setTable($index)
         return $this;
     }
 
+    public function setRecordIndex($recordIndex = null)
+    {
+        if ($recordIndex) {
+            return $this->recordIndex = $recordIndex;
+        }
+
+        return $this->recordIndex = $this->index;
+    }
+
+    public function getRecordIndex()
+    {
+        return $this->recordIndex;
+    }
+
 
     public function forcePrimaryKey()
     {
@@ -118,6 +138,11 @@ public function freshTimestamp()
      * @inheritdoc
      */
     public function getTable()
+    {
+        return $this->getIndex();
+    }
+
+    public function getIndex()
     {
         return $this->index ? : parent::getTable();
     }