Make ranges and empty search term to work in conjunction with other f…

…ilters applied
Cyber-Duck · Mar 10, 2021 · d8cfcb2 · d8cfcb2
1 parent e8f702b
commit d8cfcb2
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/src/Engines/ElasticSearchEngine.php b/src/Engines/ElasticSearchEngine.php
@@ -270,12 +270,7 @@ protected function filters(Builder $builder)
      */
     protected function ranges(Builder $builder)
     {
-        $ranges = $builder->ranges;
-
-        $field = key($ranges);
-        return [
-            $field => $ranges
-        ];
+        return $builder->ranges;
     }
 
     /**
@@ -294,22 +289,21 @@ public function searchAll(AllBuilder $builder)
                 'query' => [
                     'bool' => [
                         'must' => [
-                            'query_string' => [
-                                'query' => $builder->query,
-                                'type' => 'phrase',
-                                'default_operator' => 'and',
-                            ],
+                            [
+                                'query_string' => [
+                                    'query' => $builder->query,
+                                    'type' => 'phrase',
+                                    'default_operator' => 'and',
+                                ],
+                            ]
                         ],
                     ],
                 ],
             ],
         ];
 
-        if (empty($builder->query)) {
-            $params['body']['query'] = [
-                'match_all' => (object)null
-            ];
-
+        foreach ($this->ranges($builder) as $field => $ranges) {
+            $params['body']['query']['bool']['must'][]['range'][$field] = $ranges;
         }
 
         foreach ($this->filters($builder) as $field => $value) {
@@ -320,6 +314,18 @@ public function searchAll(AllBuilder $builder)
             ];
         }
 
+        if (empty($builder->query)) {
+            $queryContainsFilters = $this->filters($builder);
+
+            if (! $queryContainsFilters) {
+                $params['body']['query'] = [
+                    'match_all' => (object)null
+                ];
+            } else {
+                $params['body']['query']['bool']['must']['match_all'] = (object)null;
+            }
+        }
+
         if ($sort = $builder->sort) {
             $params['body']['sort'] = $sort;
         }