Added Numeric filter (#6)

* Added Numeric filter

* Added feature coverage with JSON with Tag filter

Author: vladvildanov

src/Enum/Condition.php

@@ -11,6 +11,9 @@ enum Condition: string
     case equal = '==';
     case notEqual = '!=';
     case greaterThan = '>';
+    case greaterThanOrEqual = '>=';
     case lowerThan = '<';
+    case lowerThanOrEqual = '<=';
     case pattern = '%';
+    case between = 'between';
 }

src/Query/Filter/AbstractFilter.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Vladvildanov\PredisVl\Query\Filter;
+
+use Vladvildanov\PredisVl\Enum\Condition;
+
+abstract class AbstractFilter implements FilterInterface
+{
+    /**
+     * Mappings according to Redis Query Syntax
+     *
+     * @link https://redis.io/docs/interact/search-and-query/advanced-concepts/query_syntax/
+     * @var array
+     */
+    protected array $conditionMappings = [
+        '==' => '',
+        '!=' => '-'
+    ];
+
+    /**
+     * @inheritDoc
+     */
+    public function __construct(string $fieldName, Condition $condition, mixed $value)
+    {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    abstract public function toExpression(): string;
+}

src/Query/Filter/NumericFilter.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Vladvildanov\PredisVl\Query\Filter;
+
+use Exception;
+use Vladvildanov\PredisVl\Enum\Condition;
+
+class NumericFilter extends AbstractFilter
+{
+    /**
+     * Creates numeric filter based on condition.
+     * Value can be provided as integer (single value) and in case of between condition as array of two integers.
+     */
+    public function __construct(
+        private readonly string $fieldName,
+        private readonly Condition $condition,
+        private readonly mixed $value
+    ) {
+        parent::__construct($fieldName, $condition, $value);
+    }
+
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
+    public function toExpression(): string
+    {
+        if ($this->condition === Condition::equal || $this->condition === Condition::notEqual) {
+            $condition = $this->conditionMappings[$this->condition->value];
+            return "$condition@$this->fieldName:[$this->value $this->value]";
+        }
+
+        if ($this->condition === Condition::greaterThan) {
+            return "@$this->fieldName:[($this->value +inf]";
+        }
+
+        if ($this->condition === Condition::greaterThanOrEqual) {
+            return "@$this->fieldName:[$this->value +inf]";
+        }
+
+        if ($this->condition === Condition::lowerThan) {
+            return "@$this->fieldName:[-inf ($this->value]";
+        }
+
+        if ($this->condition === Condition::lowerThanOrEqual) {
+            return "@$this->fieldName:[-inf $this->value]";
+        }
+
+        if ($this->condition === Condition::between && !is_array($this->value)) {
+            throw new Exception('Between condition requires int[] as $ value');
+        }
+
+        return "@$this->fieldName:[{$this->value[0]} {$this->value[1]}]";
+    }
+}

src/Query/Filter/TagFilter.php

@@ -6,19 +6,8 @@
 use Vladvildanov\PredisVl\Enum\Condition;
 use Vladvildanov\PredisVl\Enum\Logical;
 
-class TagFilter implements FilterInterface
+class TagFilter extends AbstractFilter
 {
-    /**
-     * Mappings according to Redis Query Syntax
-     *
-     * @link https://redis.io/docs/interact/search-and-query/advanced-concepts/query_syntax/
-     * @var array
-     */
-    private array $conditionMappings = [
-        '==' => '',
-        '!=' => '-'
-    ];
-
     /**
      * Creates tag filter based on condition.
      * Value can be provided as a string (single tag) or as an array (multiple tags).
@@ -35,6 +24,7 @@ public function __construct(
             'tags' => 'array',
         ])] private $value
     ) {
+        parent::__construct($this->fieldName, $this->condition, $this->value);
     }
 
     /**