Merge pull request #81 from utopia-php/fix-query-validator-constructor

Construct query validator from array of attribute documents

Author: TorstenDittmann

src/Database/Validator/QueryValidator.php

@@ -3,6 +3,7 @@
 namespace Utopia\Database\Validator;
 
 use Utopia\Validator;
+use Utopia\Database\Document;
 use Utopia\Database\Query;
 
 class QueryValidator extends Validator
@@ -34,11 +35,13 @@ class QueryValidator extends Validator
     /**
      * Expression constructor
      *
-     * @param array $schema
+     * @param Document[] $attributes
      */
-    public function __construct($schema)
+    public function __construct(array $attributes)
     {
-        $this->schema = $schema;
+        foreach ($attributes as $attribute) {
+            $this->schema[] = $attribute->getArrayCopy();
+        }
     }
 
     /**

tests/Database/Validator/QueriesTest.php

@@ -96,7 +96,13 @@ class QueriesTest extends TestCase
 
     public function setUp(): void
     {
-        $this->queryValidator = new QueryValidator($this->collection['attributes']);
+        // Query validator expects Document[]
+        $attributes = []; /** @var Document[] $attributes */
+        foreach ($this->collection['attributes'] as $attribute) {
+            $attributes[] = new Document($attribute);
+        }
+
+        $this->queryValidator = new QueryValidator($attributes);
 
         $query1 = Query::parse('title.notEqual("Iron Man", "Ant Man")');
         $query2 = Query::parse('description.equal("Best movie ever")');

tests/Database/Validator/QueryValidatorTest.php

@@ -5,14 +5,20 @@
 use Utopia\Database\Validator\QueryValidator;
 use PHPUnit\Framework\TestCase;
 use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Database\Query;
 
 class QueryValidatorTest extends TestCase
 {
     /**
-     * @var array 
+     * @var Document[]
      */
-    protected $schema = [
+    protected $schema;
+
+    /**
+     * @var array
+     */
+    protected $attributes = [
         [
             '$id' => 'title',
             'key' => 'title',
@@ -77,6 +83,10 @@ class QueryValidatorTest extends TestCase
 
     public function setUp(): void
     {
+        // Query validator expects Document[]
+        foreach ($this->attributes as $attribute) {
+            $this->schema[] = new Document($attribute);
+        }
     }
 
     public function tearDown(): void