aggregation feature

src/AggregateRule.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace ScoutElastic;
+
+class AggregateRule
+{
+    public function buildAggregatePayload()
+    {
+    }
+}

src/Builders/FilterBuilder.php

@@ -46,6 +46,15 @@ class FilterBuilder extends Builder
      */
     public $select = [];
 
+    /**
+     * @var array
+     */
+    public $aggregates = [];
+    /**
+     * @var array
+     */
+    public $aggregateRules = [];
+
     /**
      * FilterBuilder constructor.
      *
@@ -560,4 +569,41 @@ public function onlyTrashed()
             $this->wheres['must'][] = ['term' => ['__soft_deleted' => 1]];
         });
     }
+
+    /**
+     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/returning-only-agg-results.html
+     *
+     * @param int $size
+     * @return $this
+     */
+    public function aggregate($size = 0)
+    {
+        $this->take($size);
+        $payloadCollection = [];
+        $aggregateRules = $this->aggregateRules ?: $this->model->getAggregateRules();
+        foreach ($aggregateRules as $rule) {
+            if (is_callable($rule)) {
+                $payloadCollection[] = call_user_func($rule);
+            } else {
+                $ruleEntity = new $rule;
+                if ($aggregatePayload = $ruleEntity->buildAggregatePayload()) {
+                    $payloadCollection[] = $aggregatePayload;
+                }
+            }
+        }
+        $this->aggregates = array_reduce($payloadCollection, 'array_merge', []);
+        return $this->engine()->search($this);
+    }
+
+    /**
+     * Adds rule to the aggregate rules of the builder.
+     *
+     * @param $rule
+     * @return $this
+     */
+    public function aggregateRule($rule)
+    {
+        $this->aggregateRules[] = $rule;
+        return $this;
+    }
 }

src/ElasticEngine.php

@@ -136,6 +136,7 @@ public function buildSearchQueryPayloadCollection(Builder $builder, array $optio
                 ->setIfNotEmpty('body._source', $builder->select)
                 ->setIfNotEmpty('body.collapse.field', $builder->collapse)
                 ->setIfNotEmpty('body.sort', $builder->orders)
+                ->setIfNotEmpty('body.aggs', $builder->aggregates)
                 ->setIfNotEmpty('body.explain', $options['explain'] ?? null)
                 ->setIfNotEmpty('body.profile', $options['profile'] ?? null)
                 ->setIfNotNull('body.from', $builder->offset)
@@ -305,7 +306,10 @@ public function map(Builder $builder, $results, $model)
             $columns[] = $scoutKeyName;
         }
 
-        $ids = $this->mapIds($results)->all();
+        $ids = [];
+        foreach ($results['hits']['hits'] as $hit) {
+            $ids[] = $hit['_source'][$scoutKeyName];
+        }
 
         $query = $model::usesSoftDelete() ? $model->withTrashed() : $model->newQuery();
 
@@ -315,8 +319,8 @@ public function map(Builder $builder, $results, $model)
             ->keyBy($scoutKeyName);
 
         return Collection::make($results['hits']['hits'])
-            ->map(function ($hit) use ($models) {
-                $id = $hit['_id'];
+            ->map(function ($hit) use ($models, $scoutKeyName) {
+                $id = $hit['_source'][$scoutKeyName];
 
                 if (isset($models[$id])) {
                     $model = $models[$id];

src/Indexers/SingleIndexer.php

@@ -52,10 +52,13 @@ public function delete(Collection $models)
     {
         $models->each(function ($model) {
             $payload = (new DocumentPayload($model))
-                ->set('client.ignore', 404)
-                ->get();
+                ->set('client.ignore', 404);
 
-            ElasticClient::delete($payload);
+            if ($documentRefresh = config('scout_elastic.document_refresh')) {
+                $payload->set('refresh', $documentRefresh);
+            }
+
+            ElasticClient::delete($payload->get());
         });
     }
 }

src/Searchable.php

@@ -97,6 +97,14 @@ public function getSearchRules()
             $this->searchRules : [SearchRule::class];
     }
 
+    /**
+     * @return array
+     */
+    public function getAggregateRules()
+    {
+        return isset($this->aggregateRules) && count($this->aggregateRules) > 0 ? $this->aggregateRules : [AggregateRule::class];
+    }
+
     /**
      * Execute the search.
      *