Merge pull request #17 from designmynight/add-collection

Fixes
designmynight · Jan 13, 2018 · f069b47 · f069b47
2 parents a204f34 + b495c92
commit f069b47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/DesignMyNight/Elasticsearch/EloquentBuilder.php b/src/DesignMyNight/Elasticsearch/EloquentBuilder.php
@@ -22,7 +22,7 @@ public function setModel(Model $model)
     {
         $this->model = $model;
 
-        $this->query->from($model->getTable());
+        $this->query->from($model->getSearchIndex());
 
         $this->query->type($model->getSearchType());
 

diff --git a/src/DesignMyNight/Elasticsearch/QueryProcessor.php b/src/DesignMyNight/Elasticsearch/QueryProcessor.php
@@ -25,6 +25,8 @@ public function processSelect(Builder $query, $results)
 
         $this->aggregations = $results['aggregations'] ?? [];
 
+        $this->query = $query;
+
         // Return a generator if we got a scroll cursor in the results
         if (isset($results['_scroll_id'])){
             return $this->yieldResults($results);
@@ -50,13 +52,13 @@ protected function yieldResults($results): Generator
     {
         // First yield each result from the initial request
         foreach ($results['hits']['hits'] as $result){
-            yield $this->documentFromResult($query, $result);
+            yield $this->documentFromResult($this->query, $result);
         }
 
         // Then go through the scroll cursor getting one result at a time
         if (isset($results['scrollCursor'])){
             foreach ($results['scrollCursor'] as $result){
-                $document = $this->documentFromResult($query, $result);
+                $document = $this->documentFromResult($this->query, $result);
 
                 yield $document;
             }
@@ -92,7 +94,9 @@ protected function documentFromResult(Builder $query, array $result): array
     protected function addInnerHitsToDocument($document, $innerHits): array
     {
         foreach ($innerHits as $documentType => $hitResults){
-            $document['inner_hits'][$documentType] = array_column($hitResults['hits']['hits'], '_source');
+            foreach ( $hitResults['hits']['hits'] as $result ){
+                $document['inner_hits'][$documentType][] = array_merge(['_id' => $result['_id']], $result['_source']);
+            }
         }
 
         return $document;