Merge pull request #20 from designmynight/aggregation-collection

feat: Added support for getting aggregation results as a custom collection

src/DesignMyNight/Elasticsearch/EloquentBuilder.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Collection;
 
 class EloquentBuilder extends BaseBuilder
 {
@@ -60,6 +61,14 @@ public function get($columns = ['*'])
         return $builder->getModel()->newCollection($models);
     }
 
+    public function getAggregations(string $collectionClass = ''): Collection
+    {
+        $collectionClass = $collectionClass ?: Collection::class;
+        $aggregations = $this->query->getAggregationResults();
+
+        return new $collectionClass($aggregations);
+    }
+
     /**
      * Get the hydrated models without eager loading.
      *

src/DesignMyNight/Elasticsearch/QueryBuilder.php

@@ -18,6 +18,8 @@ class QueryBuilder extends BaseBuilder
 
     public $includeInnerHits;
 
+    protected $results;
+
     protected $rawResponse;
 
     protected $scrollSelect;
@@ -366,6 +368,8 @@ public function withInnerHits(): self
      */
     public function getAggregationResults(): array
     {
+        $this->getResultsOnce();
+
         return $this->processor->getAggregationResults();
     }
 
@@ -383,13 +387,22 @@ public function get($columns = ['*'])
             $this->columns = $columns;
         }
 
-        $results = $this->processor->processSelect($this, $this->runSelect());
+        $results = $this->getResultsOnce();
 
         $this->columns = $original;
 
         return $this->shouldUseScroll() ? $results : collect($results);
     }
 
+    protected function getResultsOnce(): array
+    {
+        if ($this->results === null) {
+            $this->results = $this->processor->processSelect($this, $this->runSelect());
+        }
+
+        return $this->results;
+    }
+
     /**
      * Run the query as a "select" statement against the connection.
      *