Added bulkDistinct() and relations for distinct()

Author: pdphilip

src/Eloquent/Builder.php

@@ -456,22 +456,26 @@ public function withTable($table)
     public function distinct(mixed $columns = [], bool $includeCount = false): ElasticCollection
     {
         $elasticQueryCollection = $this->query->distinct($columns, $includeCount);
+        $builder = $this->applyScopes();
         $eloquentCollection = $this->model->hydrate(
             $elasticQueryCollection->all()
         );
+        $modelsCollection = ElasticCollection::loadCollection($eloquentCollection)->loadMeta($elasticQueryCollection->getQueryMeta());
+        $models = $modelsCollection->all();
+        $models = $this->loadRelations($models, $builder);
 
-        return ElasticCollection::loadCollection($eloquentCollection)->loadMeta($elasticQueryCollection->getQueryMeta());
+        return ElasticCollection::loadCollection($builder->getModel()->newCollection($models))->loadMeta($modelsCollection->getQueryMeta());
     }
 
-    //    public function bulkDistinct(array $columns = [], bool $includeCount = false)
-    //    {
-    //        $elasticQueryCollection = $this->query->bulkDistinct($columns, $includeCount);
-    //        $eloquentCollection = $this->model->hydrate(
-    //            $elasticQueryCollection->all()
-    //        );
-    //
-    //        return ElasticCollection::loadCollection($eloquentCollection)->loadMeta($elasticQueryCollection->getQueryMeta());
-    //    }
+    public function bulkDistinct(array $columns = [], bool $includeCount = false): ElasticCollection
+    {
+        $elasticQueryCollection = $this->query->bulkDistinct($columns, $includeCount);
+        $eloquentCollection = $this->model->hydrate(
+            $elasticQueryCollection->all()
+        );
+
+        return ElasticCollection::loadCollection($eloquentCollection)->loadMeta($elasticQueryCollection->getQueryMeta());
+    }
 
     public function min($column, array $options = [])
     {

src/Eloquent/Docs/ModelDocs.php

@@ -203,13 +203,15 @@
  * @method static bool chunkById($count, $callback, $column = '_id', $alias = null)
  *                                                                                  -----------------------------------
  * @method static ElasticCollection distinct($columns = [], $includeCount = false)
+ * @method static ElasticCollection bulkDistinct($columns = [], $includeCount = false)
  *===========================================
  * Aggregators Methods
  *===========================================
  * @method static int|array sum($columns)
  * @method static int|array min($columns)
  * @method static int|array max($columns)
  * @method static int|array avg($columns)
+ * @method static int|array average($columns)
  * @method static mixed agg(array $functions, $column)
  *-----------------------------------
  * @method static mixed boxplot($columns, $options = [])
@@ -219,7 +221,7 @@
  * @method static mixed medianAbsoluteDeviation($columns, $options = [])
  * @method static mixed percentiles($columns, $options = [])
  * @method static mixed stats($columns, $options = [])
- * @method static mixed stringStats( $columns, $options = [])
+ * @method static mixed stringStats($columns, $options = [])
  *-----------------------------------
  * @method static array getAggregationResults()
  * @method static array getRawAggregationResults()

src/Query/Concerns/ProcessesDistinctAggregations.php

@@ -8,18 +8,31 @@ trait ProcessesDistinctAggregations
 {
     public function processDistinctAggregations($index, $result, $columns, $withCount): Collection
     {
-        if (! empty($result['hits']['hits']) && is_array($result['hits']['hits'])) {
-            $last = collect($result['hits']['hits'])->last();
-            if (! empty($last['sort'])) {
-                $this->query->getMetaTransfer()->set('after_key', $last['sort']);
-            }
-        }
+        $this->pullAfterKey($result);
         $keys = [];
         foreach ($columns as $column) {
             $keys[] = 'by_'.$column;
         }
+        $aggregations = $this->parseDistinctBucket($columns, $keys, $result['aggregations'], 0, $withCount);
+        $aggregations = collect($aggregations);
 
-        $aggregations = collect($this->parseDistinctBucket($columns, $keys, $result['aggregations'], 0, $withCount));
+        return $aggregations->map(function ($aggregation) use ($index) {
+            return $this->liftToMeta($aggregation, ['_index' => $index], ['doc_count']);
+        });
+    }
+
+    public function processBulkDistinctAggregations($index, $result, $columns, $withCount): Collection
+    {
+        $this->pullAfterKey($result);
+        $aggregations = [];
+        foreach ($columns as $column) {
+            $keys = ['by_'.$column];
+            $aggregations = [
+                ...$aggregations,
+                ...$this->parseDistinctBucket([$column], $keys, $result['aggregations'], 0, $withCount),
+            ];
+        }
+        $aggregations = collect($aggregations);
 
         return $aggregations->map(function ($aggregation) use ($index) {
             return $this->liftToMeta($aggregation, ['_index' => $index], ['doc_count']);
@@ -54,4 +67,14 @@ protected function parseDistinctBucket($columns, $keys, $response, $index, $incl
 
         return $data;
     }
+
+    protected function pullAfterKey($result)
+    {
+        if (! empty($result['hits']['hits']) && is_array($result['hits']['hits'])) {
+            $last = collect($result['hits']['hits'])->last();
+            if (! empty($last['sort'])) {
+                $this->query->getMetaTransfer()->set('after_key', $last['sort']);
+            }
+        }
+    }
 }

src/Query/Processor.php

@@ -111,10 +111,10 @@ public function processSelect(BaseBuilder|Builder $query, $results): array|Colle
         if ($this->query->bulkDistinct) {
             $query->getMetaTransfer()->set('query', 'bulkDistinct');
             $index = $query->inferIndex();
-            //                    $documents = $this->processDistinctAggregations($index, $response, $query->columns, $query->distinctCount ?? false);
-            //                    $query->getMetaTransfer()->set('total', $documents->count());
-            //
-            //                    return $documents->all();
+            $documents = $this->processBulkDistinctAggregations($index, $response, $query->columns, $query->distinctCount ?? false);
+            $query->getMetaTransfer()->set('total', $documents->count());
+
+            return $documents->all();
         }
 
         $this->aggregations = $response['aggregations'] ?? [];