Add aggregations support

babenkoivan · Jul 1, 2020 · c6ff71d · c6ff71d
1 parent b5457ec
commit c6ff71d
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -232,7 +232,7 @@ $request->setHighlight([
 ]);
 
 $request->setSuggest([
-    'my_suggest' => [
+    'message_suggest' => [
         'text' => 'test',
         'term' => [
             'field' => 'message'
@@ -246,6 +246,14 @@ $request->setCollapse([
     'field' => 'user'
 ]);
 
+$request->setAggregations([
+    'max_likes' => [
+        'max' => [
+            'field' => 'likes'
+        ]
+    ]
+]);
+
 $request->setSort([
     ['post_date' => ['order' => 'asc']],
     '_score'
@@ -270,4 +278,7 @@ foreach ($hits as $hit) {
 
 // suggestions
 $suggestions = $response->getSuggestions();
+
+// aggregations
+$aggregations = $response->getAggregations();
 ```
diff --git a/src/Search/SearchRequest.php b/src/Search/SearchRequest.php
@@ -39,6 +39,10 @@ final class SearchRequest implements ArrayableInterface
      * @var array|null
      */
     private $collapse;
+    /**
+     * @var array|null
+     */
+    private $aggregations;
 
     public function __construct(array $query)
     {
@@ -91,13 +95,19 @@ public function setCollapse(array $collapse): self
         return $this;
     }
 
+    public function setAggregations(array $aggregations): self
+    {
+        $this->aggregations = $aggregations;
+        return $this;
+    }
+
     public function toArray(): array
     {
         $request = [
             'query' => $this->query
         ];
 
-        foreach (['highlight', 'sort', 'from', 'size', 'suggest', 'collapse'] as $property) {
+        foreach (['highlight', 'sort', 'from', 'size', 'suggest', 'collapse', 'aggregations'] as $property) {
             if (isset($this->$property)) {
                 $request[$property] = $this->$property;
             }

diff --git a/src/Search/SearchResponse.php b/src/Search/SearchResponse.php
@@ -39,6 +39,11 @@ public function getSuggestions(): array
         }, $this->response['suggest'] ?? []);
     }
 
+    public function getAggregations(): array
+    {
+        return $this->response['aggregations'] ?? [];
+    }
+
     public function getRaw(): array
     {
         return $this->response;

diff --git a/tests/Unit/Search/SearchRequestTest.php b/tests/Unit/Search/SearchRequestTest.php
@@ -189,4 +189,32 @@ public function test_array_casting_with_collapse(): void
             ]
         ], $request->toArray());
     }
+
+    public function test_array_casting_with_aggregations(): void
+    {
+        $request = new SearchRequest([
+            'match_all' => new stdClass()
+        ]);
+
+        $request->setAggregations([
+            'min_price' => [
+                'min' => [
+                    'field' => 'price'
+                ]
+            ]
+        ]);
+
+        $this->assertEquals([
+            'query' => [
+                'match_all' => new stdClass()
+            ],
+            'aggregations' => [
+                'min_price' => [
+                    'min' => [
+                        'field' => 'price'
+                    ]
+                ]
+            ]
+        ], $request->toArray());
+    }
 }
diff --git a/tests/Unit/Search/SearchResponseTest.php b/tests/Unit/Search/SearchResponseTest.php
@@ -94,6 +94,24 @@ public function test_suggestions_can_be_retrieved(): void
         ], $searchResponse->getSuggestions());
     }
 
+    public function test_aggregations_can_be_retrieved(): void
+    {
+        $searchResponse = new SearchResponse([
+            'hits' => [],
+            'aggregations' => [
+                'min_price' => [
+                    'value' => 10
+                ]
+            ]
+        ]);
+
+        $this->assertEquals([
+            'min_price' => [
+                'value' => 10
+            ]
+        ], $searchResponse->getAggregations());
+    }
+
     public function test_raw_representation_can_be_retrieved(): void
     {
         $searchResponse = new SearchResponse([