added query options to aggregations

elegisandi · Apr 3, 2018 · 56a179f · 56a179f
1 parent faf43f1
commit 56a179f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -97,12 +97,14 @@ AWS Elasticsearch Service for Laravel/Lumen
 
 ## Available Methods
 
-* ##### aggregations(array $aggs, array $query = [], $type, $index)
+* ##### aggregations(array $aggs, array $query = [], array $options = [], $type, $index)
 
     > **$aggs** : must follow the structure specified in [elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html).
 
     > **$query** : see `search` method `$query` argument
 
+    > **$options** : see `search` method `$options` argument
+
     > returns `Array`
 
 * ##### search(array $query = [], array $options = [], array $range = [], $type, $index)

diff --git a/src/ElasticSearch.php b/src/ElasticSearch.php
@@ -36,20 +36,21 @@ public function __construct()
     /**
      * @param array $aggs
      * @param array $query
+     * @param array $options
      * @param string $type
      * @param string $index
      * @return array|null
      * @throws \Exception
      */
-    private function aggregations(array $aggs, array $query = [], $type, $index)
+    private function aggregations(array $aggs, array $query = [], array $options = [], $type, $index)
     {
         $params = [
             'index' => $index,
             'type' => $type,
-            'body' => [
+            'body' => array_merge([
                 'size' => 0,
                 'aggs' => $aggs
-            ],
+            ], $options),
         ];
 
         // create query filters
@@ -58,7 +59,7 @@ private function aggregations(array $aggs, array $query = [], $type, $index)
         // set bool query if filters not empty
         if (!empty($filters)) {
             $params['body']['query'] = [
-                'bool' => $filters
+                'bool' => array_merge_recursive($params['body']['query']['bool'] ?? [], $filters)
             ];
         }
 
@@ -77,7 +78,7 @@ private function aggregations(array $aggs, array $query = [], $type, $index)
 
     /**
      * @param array $query
-     * @param array $options [sort, size, from]
+     * @param array $options [sort, size, from, query]
      * @param array $range
      * @param string $type
      * @param string $index
@@ -103,7 +104,7 @@ private function search(array $query = [], array $options = [], array $range = [
         // set bool query if filters not empty
         if (!empty($filters)) {
             $params['body']['query'] = [
-                'bool' => $filters
+                'bool' => array_merge_recursive($params['body']['query']['bool'] ?? [], $filters)
             ];
         }
 

diff --git a/src/ElasticSearchFacade.php b/src/ElasticSearchFacade.php
@@ -10,7 +10,7 @@
  * Class ElasticSearchFacade
  * @package elegisandi\AWSElasticsearchService
  *
- * @method static array aggregations(array $aggs, array $query = [], $type = null, $index = null)
+ * @method static array aggregations(array $aggs, array $query = [], array $options = [], $type = null, $index = null)
  * @method static array search(array $query = [], array $options = [], array $range = [], $type = null, $index = null)
  * @method static array count(array $query = [], array $range = [], $type = null, $index = null)
  * @method static array setSearchParams(Request $request, array $defaults = [], $type = null)