Merge pull request #58 from ensi-platform/v7-ecs-803

add orWhere and orWhereNot

Author: MsNatali

src/Concerns/DecoratesBoolQuery.php

@@ -23,13 +23,27 @@ public function where(string $field, mixed $operator, mixed $value = null): stat
         return $this;
     }
 
+    public function orWhere(string $field, mixed $operator, mixed $value = null): static
+    {
+        $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
+
+        return $this;
+    }
+
     public function whereNot(string $field, mixed $value): static
     {
         $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
 
         return $this;
     }
 
+    public function orWhereNot(string $field, mixed $value): static
+    {
+        $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
+
+        return $this;
+    }
+
     public function whereHas(string $nested, Closure $filter): static
     {
         $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());

src/Contracts/BoolQuery.php

@@ -9,8 +9,12 @@ interface BoolQuery
 {
     public function where(string $field, mixed $operator, mixed $value = null): static;
 
+    public function orWhere(string $field, mixed $operator, mixed $value = null): static;
+
     public function whereNot(string $field, mixed $value): static;
 
+    public function orWhereNot(string $field, mixed $value): static;
+
     public function whereIn(string $field, array|Arrayable $values): static;
 
     public function orWhereIn(string $field, array|Arrayable $values): static;

src/Filtering/BoolQueryBuilder.php

@@ -93,23 +93,47 @@ public function where(string $field, mixed $operator, mixed $value = null): stat
             return $this->whereNot($field, $value);
         }
 
-        if (func_num_args() === 2) {
-            [$operator, $value] = ['=', $operator];
+        $this->filter->add($this->makeWhere(...func_get_args()));
+
+        return $this;
+    }
+
+    public function orWhere(string $field, mixed $operator, mixed $value = null): static
+    {
+        if ($operator === '!=') {
+            return $this->orWhereNot($field, $value);
         }
 
-        $criteria = $this->createComparisonCriteria($this->absolutePath($field), $operator, $value);
-        $this->filter->add($criteria);
+        $this->should->add($this->makeWhere(...func_get_args()));
 
         return $this;
     }
 
+    protected function makeWhere(string $field, mixed $operator, mixed $value = null): Criteria
+    {
+        if (func_num_args() === 2) {
+            [$operator, $value] = ['=', $operator];
+        }
+
+        return $operator === '='
+            ? new Term($this->absolutePath($field), $value)
+            : new RangeBound($this->absolutePath($field), $operator, $value);
+    }
+
     public function whereNot(string $field, mixed $value): static
     {
         $this->mustNot->add(new Term($this->absolutePath($field), $value));
 
         return $this;
     }
 
+    public function orWhereNot(string $field, mixed $value): static
+    {
+        $this->should->add(new Term($this->absolutePath($field), $value));
+
+        return $this;
+    }
+
     public function whereIn(string $field, array|Arrayable $values): static
     {
         $this->filter->add(new Terms($this->absolutePath($field), $values));
@@ -240,13 +264,6 @@ protected function addNestedCriteria(string $nested, Closure $filter, CriteriaCo
         return $this;
     }
 
-    protected function createComparisonCriteria(string $field, string $operator, mixed $value): Criteria
-    {
-        return $operator === '=' || $operator === '!='
-            ? new Term($field, $value)
-            : new RangeBound($field, $operator, $value);
-    }
-
     protected function basePath(): string
     {
         return $this->path;