Add additional Where operators

Author: tobyzerner

src/Laravel/Filter/SupportsOperators.php

@@ -38,31 +38,46 @@ public function apply(object $query, array|string $value, Context $context): voi
             return;
         }
 
-        [$operator, $resolved] = $this->resolveOperator($value);
-
-        switch ($operator) {
-            case 'eq':
-            case 'in':
-                $this->applyEquals($query, $resolved);
-                break;
-
-            case 'ne':
-                $this->applyNotEquals($query, $resolved);
-                break;
-
-            case 'lt':
-            case 'lte':
-            case 'gt':
-            case 'gte':
-                $this->applyComparison($query, $operator, $resolved);
-                break;
-
-            case 'like':
-                $this->applyLike($query, $resolved);
-                break;
-
-            default:
-                throw new BadRequestException("Unsupported operator: $operator");
+        if (is_string($value) || array_is_list($value)) {
+            $this->applyEquals($query, $value);
+            return;
+        }
+
+        foreach ($value as $operator => $v) {
+            switch ($operator) {
+                case 'eq':
+                case 'in':
+                    $this->applyEquals($query, $v);
+                    break;
+
+                case 'ne':
+                case 'notin':
+                    $this->applyNotEquals($query, $v);
+                    break;
+
+                case 'lt':
+                case 'lte':
+                case 'gt':
+                case 'gte':
+                    $this->applyComparison($query, $operator, $v);
+                    break;
+
+                case 'like':
+                    $this->applyLike($query, $v);
+                    break;
+
+                case 'notlike':
+                    $this->applyNotLike($query, $v);
+                    break;
+
+                case 'null':
+                case 'notnull':
+                    $this->applyNull($query, $operator === 'null' ? (bool) $v : !$v);
+                    break;
+
+                default:
+                    throw new BadRequestException("Unsupported operator: $operator");
+            }
         }
     }
 
@@ -107,6 +122,18 @@ private function applyLike(object $query, array|string $value): void
         $query->where($this->getColumn(), 'like', $value);
     }
 
+    private function applyNotLike(object $query, array|string $value): void
+    {
+        $value = $this->firstValue($value);
+
+        $query->where($this->getColumn(), 'not like', $value);
+    }
+
+    private function applyNull(object $query, bool $value): void
+    {
+        $query->{$value ? 'whereNull' : 'whereNotNull'}($this->getColumn());
+    }
+
     private function firstValue(array|string $value): mixed
     {
         if (is_array($value)) {

src/Laravel/Filter/Where.php

@@ -81,6 +81,19 @@ public function apply(object $query, array|string $value, Context $context): voi
         });
     }
 
+    private function resolveOperator(array|string $value): array
+    {
+        if (is_array($value) && !array_is_list($value)) {
+            $keys = array_keys($value);
+
+            if (count($keys) === 1 && in_array($keys[0], ['eq', 'in', 'ne'])) {
+                return [$keys[0], $value[$keys[0]]];
+            }
+        }
+
+        return ['eq', $value];
+    }
+
     private function extractIds(array|string $value): ?array
     {
         if (is_string($value)) {