Implement filter with or

Author: PMessinezis

src/Struct/FilterStruct.php

@@ -8,6 +8,8 @@ class FilterStruct {
         "!is" => "!=",
     ];
 
+    private static $LOGICAL_OR = "|";
+
     private static $WHERE_QUERY_MAPPING = [
         "in" => "whereIn",
         "!in" => "whereNotIn",
@@ -19,12 +21,32 @@ class FilterStruct {
     public $value;
 
     public function __construct($fieldName, $operator, $value) {
-        $this->fieldName = $fieldName;
+        if (strpos($fieldName, self::$LOGICAL_OR)) {
+            $this->fieldName = explode(self::$LOGICAL_OR, $fieldName);
+        } else {
+            $this->fieldName = $fieldName;
+        }
         $this->operator = $this->transformOperator($operator);
         $this->value = $value;
     }
 
     public function apply($object) {
+        if (is_array($this->fieldName)) {
+            $me = $this;
+
+            $subquery = function ($query) use ($me) {
+                $query = $query->where($me->fieldName[0], $me->operator, $me->value);
+
+                for ($fieldIndex = 1; $fieldIndex < count($me->fieldName); $fieldIndex++) {
+                    $query = $query->orWhere($me->fieldName[$fieldIndex], $me->operator, $me->value);
+                }
+
+                return $query;
+            };
+
+            return $object->where($subquery);
+        }
+
         if(array_key_exists($this->operator, self::$WHERE_QUERY_MAPPING)) {
             $whereQuery = self::$WHERE_QUERY_MAPPING[$this->operator];
 

tests/RequestParserTest.php

@@ -200,4 +200,53 @@ function testTargetNotModel()
         $requestParser = new RequestParser($request);
         $requestParser->getBuilder();
     }
+
+    function testFilterWithOr()
+    {
+
+        //Create Request
+        $uri = 'some_model';
+        $controllerClass = MockModelController::class;
+        $query = new ParameterBag([
+            "filter" => [
+                "x|y" =>  [
+                    "is" => "1"
+                ],
+                "z" => [
+                    "in" => "1,2,3"
+                ]
+            ]
+        ]);
+        $requestParserOptions = [
+            'model_namespaces' => [
+                'LIQRGV\QueryFilter\Mocks',
+            ]
+        ];
+
+        $request = $this->createControllerRequest($uri, $controllerClass, $query, $requestParserOptions);
+        $requestParser = new RequestParser($request);
+        $builder = $requestParser->getBuilder();
+
+        $query = $builder->getQuery();
+
+        $this->assertEquals("mock_models", $query->from);
+
+        //Assert subquery exists
+        $this->assertArrayHasKey('query', $query->wheres[0]);
+        $subquery = $query->wheres[0]['query'];
+
+        //Assert subquery components
+        $this->assertEquals("x", $subquery->wheres[0]['column']);
+        $this->assertEquals("=", strtolower($subquery->wheres[0]['operator']));
+
+        $this->assertEquals("y", $subquery->wheres[1]['column']);
+        $this->assertEquals("=", strtolower($subquery->wheres[1]['operator']));
+        $this->assertEquals("or", strtolower($subquery->wheres[1]['boolean']));
+
+        //Assert second where term of the main query
+        $this->assertEquals("z", $query->wheres[1]['column']);
+        $this->assertEquals("in", strtolower($query->wheres[1]['type']));
+
+        $this->assertEquals(['1', '1', '1', '2', '3'], $builder->getBindings());
+    }
 }