Add $idAttributeType

fogelito · fogelito · commit 41e6f760857f · 2025-07-14T10:16:49.000+03:00
diff --git a/src/Database/Database.php b/src/Database/Database.php
@@ -4354,6 +4354,7 @@ public function updateDocuments(
             $validator = new DocumentsValidator(
                 $attributes,
                 $indexes,
+                $this->adapter->getIdAttributeType(),
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
@@ -5804,6 +5805,7 @@ public function deleteDocuments(
             $validator = new DocumentsValidator(
                 $attributes,
                 $indexes,
+                $this->adapter->getIdAttributeType(),
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime()
@@ -5995,6 +5997,7 @@ public function find(string $collection, array $queries = [], string $forPermiss
             $validator = new DocumentsValidator(
                 $attributes,
                 $indexes,
+                $this->adapter->getIdAttributeType(),
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
@@ -6248,6 +6251,7 @@ public function count(string $collection, array $queries = [], ?int $max = null)
             $validator = new DocumentsValidator(
                 $attributes,
                 $indexes,
+                $this->adapter->getIdAttributeType(),
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
@@ -6298,6 +6302,7 @@ public function sum(string $collection, string $attribute, array $queries = [],
             $validator = new DocumentsValidator(
                 $attributes,
                 $indexes,
+                $this->adapter->getIdAttributeType(),
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
diff --git a/src/Database/Validator/Queries/Documents.php b/src/Database/Validator/Queries/Documents.php
@@ -19,12 +19,14 @@ class Documents extends IndexedQueries
      * Expression constructor
      *
      * @param array<mixed> $attributes
+     * @param string $idAttributeType
      * @param array<mixed> $indexes
      * @throws Exception
      */
     public function __construct(
         array $attributes,
         array $indexes,
+        string $idAttributeType,
         int $maxValuesCount = 100,
         \DateTime $minAllowedDate = new \DateTime('0000-01-01'),
         \DateTime $maxAllowedDate = new \DateTime('9999-12-31'),
@@ -60,6 +62,7 @@ public function __construct(
             new Cursor(),
             new Filter(
                 $attributes,
+                $idAttributeType,
                 $maxValuesCount,
                 $minAllowedDate,
                 $maxAllowedDate,
diff --git a/src/Database/Validator/Query/Filter.php b/src/Database/Validator/Query/Filter.php
@@ -26,7 +26,8 @@ class Filter extends Base
      * @param \DateTime $maxAllowedDate
      */
     public function __construct(
-        array $attributes = [],
+        array $attributes,
+        private readonly string $idAttributeType,
         private readonly int $maxValuesCount = 100,
         private readonly \DateTime $minAllowedDate = new \DateTime('0000-01-01'),
         private readonly \DateTime $maxAllowedDate = new \DateTime('9999-12-31'),
@@ -108,11 +109,11 @@ protected function isValidAttributeAndValues(string $attribute, array $values, s
 
             switch ($attributeType) {
                 case Database::VAR_SEQUENCE:
-                    $validator = new Sequence('int', true);
+                    $validator = new Sequence($this->idAttributeType, true);
                     break;
 
                 case Database::VAR_ID:
-                    $validator = new Sequence('int', false);
+                    $validator = new Sequence($this->idAttributeType, false);
                     break;
 
                 case Database::VAR_STRING:
diff --git a/tests/unit/Validator/DocumentsQueriesTest.php b/tests/unit/Validator/DocumentsQueriesTest.php
@@ -76,6 +76,16 @@ public function setUp(): void
                     'signed' => false,
                     'array' => false,
                     'filters' => [],
+                ]),
+                new Document([
+                    '$id' => 'id',
+                    'key' => 'id',
+                    'type' => Database::VAR_ID,
+                    'size' => 0,
+                    'required' => false,
+                    'signed' => false,
+                    'array' => false,
+                    'filters' => [],
                 ])
             ],
             'indexes' => [
@@ -113,9 +123,14 @@ public function tearDown(): void
      */
     public function testValidQueries(): void
     {
-        $validator = new Documents($this->collection['attributes'], $this->collection['indexes']);
+        $validator = new Documents(
+            $this->collection['attributes'],
+            $this->collection['indexes'],
+            'int'
+        );
 
         $queries = [
+            Query::notEqual('id', '1000000'),
             Query::equal('description', ['Best movie ever']),
             Query::equal('description', ['']),
             Query::equal('is_bool', [false]),
@@ -146,7 +161,11 @@ public function testValidQueries(): void
      */
     public function testInvalidQueries(): void
     {
-        $validator = new Documents($this->collection['attributes'], $this->collection['indexes']);
+        $validator = new Documents(
+            $this->collection['attributes'],
+            $this->collection['indexes'],
+            'int'
+        );
 
         $queries = ['{"method":"notEqual","attribute":"title","values":["Iron Man","Ant Man"]}'];
         $this->assertEquals(false, $validator->isValid($queries));
@@ -167,5 +186,7 @@ public function testInvalidQueries(): void
         $queries = [Query::equal('title', [])]; // empty array
         $this->assertEquals(false, $validator->isValid($queries));
         $this->assertEquals('Invalid query: Equal queries require at least one value.', $validator->getDescription());
+
+
     }
 }
diff --git a/tests/unit/Validator/IndexedQueriesTest.php b/tests/unit/Validator/IndexedQueriesTest.php
@@ -80,7 +80,7 @@ public function testValid(): void
             $indexes,
             [
                 new Cursor(),
-                new Filter($attributes),
+                new Filter($attributes, 'int'),
                 new Limit(),
                 new Offset(),
                 new Order($attributes)
@@ -143,7 +143,7 @@ public function testMissingIndex(): void
             $indexes,
             [
                 new Cursor(),
-                new Filter($attributes),
+                new Filter($attributes, 'int'),
                 new Limit(),
                 new Offset(),
                 new Order($attributes)
@@ -196,7 +196,7 @@ public function testTwoAttributesFulltext(): void
             $indexes,
             [
                 new Cursor(),
-                new Filter($attributes),
+                new Filter($attributes, 'int'),
                 new Limit(),
                 new Offset(),
                 new Order($attributes)
diff --git a/tests/unit/Validator/QueriesTest.php b/tests/unit/Validator/QueriesTest.php
@@ -63,7 +63,7 @@ public function testValid(): void
         $validator = new Queries(
             [
                 new Cursor(),
-                new Filter($attributes),
+                new Filter($attributes, 'int'),
                 new Limit(),
                 new Offset(),
                 new Order($attributes)
diff --git a/tests/unit/Validator/Query/FilterTest.php b/tests/unit/Validator/Query/FilterTest.php
@@ -18,34 +18,34 @@ class FilterTest extends TestCase
      */
     public function setUp(): void
     {
-        $this->validator = new Filter(
-            attributes: [
-                new Document([
-                    '$id' => 'string',
-                    'key' => 'string',
-                    'type' => Database::VAR_STRING,
-                    'array' => false,
-                ]),
-                new Document([
-                    '$id' => 'string_array',
-                    'key' => 'string_array',
-                    'type' => Database::VAR_STRING,
-                    'array' => true,
-                ]),
-                new Document([
-                    '$id' => 'integer_array',
-                    'key' => 'integer_array',
-                    'type' => Database::VAR_INTEGER,
-                    'array' => true,
-                ]),
-                new Document([
-                    '$id' => 'integer',
-                    'key' => 'integer',
-                    'type' => Database::VAR_INTEGER,
-                    'array' => false,
-                ]),
-            ],
-        );
+        $attributes = [
+            new Document([
+                '$id' => 'string',
+                'key' => 'string',
+                'type' => Database::VAR_STRING,
+                'array' => false,
+            ]),
+            new Document([
+                '$id' => 'string_array',
+                'key' => 'string_array',
+                'type' => Database::VAR_STRING,
+                'array' => true,
+            ]),
+            new Document([
+                '$id' => 'integer_array',
+                'key' => 'integer_array',
+                'type' => Database::VAR_INTEGER,
+                'array' => true,
+            ]),
+            new Document([
+                '$id' => 'integer',
+                'key' => 'integer',
+                'type' => Database::VAR_INTEGER,
+                'array' => false,
+            ]),
+        ];
+        
+        $this->validator = new Filter($attributes, 'int');
     }
 
     public function testSuccess(): void
diff --git a/tests/unit/Validator/QueryTest.php b/tests/unit/Validator/QueryTest.php
@@ -108,7 +108,7 @@ public function tearDown(): void
      */
     public function testQuery(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $this->assertEquals(true, $validator->isValid([Query::equal('$id', ['Iron Man', 'Ant Man'])]));
         $this->assertEquals(true, $validator->isValid([Query::equal('$id', ['Iron Man'])]));
@@ -138,7 +138,7 @@ public function testQuery(): void
      */
     public function testAttributeNotFound(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::equal('name', ['Iron Man'])]);
         $this->assertEquals(false, $response);
@@ -154,7 +154,7 @@ public function testAttributeNotFound(): void
      */
     public function testAttributeWrongType(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::equal('title', [1776])]);
         $this->assertEquals(false, $response);
@@ -166,7 +166,7 @@ public function testAttributeWrongType(): void
      */
     public function testQueryDate(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::greaterThan('birthDay', '1960-01-01 10:10:10')]);
         $this->assertEquals(true, $response);
@@ -177,7 +177,7 @@ public function testQueryDate(): void
      */
     public function testQueryLimit(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::limit(25)]);
         $this->assertEquals(true, $response);
@@ -191,7 +191,7 @@ public function testQueryLimit(): void
      */
     public function testQueryOffset(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::offset(25)]);
         $this->assertEquals(true, $response);
@@ -205,7 +205,7 @@ public function testQueryOffset(): void
      */
     public function testQueryOrder(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::orderAsc('title')]);
         $this->assertEquals(true, $response);
@@ -225,7 +225,7 @@ public function testQueryOrder(): void
      */
     public function testQueryCursor(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::cursorAfter(new Document(['$id' => 'asdf']))]);
         $this->assertEquals(true, $response);
@@ -255,7 +255,7 @@ public function testQueryGetByType(): void
      */
     public function testQueryEmpty(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $response = $validator->isValid([Query::equal('title', [''])]);
         $this->assertEquals(true, $response);
@@ -284,7 +284,7 @@ public function testQueryEmpty(): void
      */
     public function testOrQuery(): void
     {
-        $validator = new Documents($this->attributes, []);
+        $validator = new Documents($this->attributes, [], 'int');
 
         $this->assertFalse($validator->isValid(
             [Query::or(

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testValid(): void`
`63`	`63`	`$validator = new Queries(`
`64`	`64`	`[`
`65`	`65`	`new Cursor(),`
`66`		`- new Filter($attributes),`
	`66`	`+ new Filter($attributes, 'int'),`
`67`	`67`	`new Limit(),`
`68`	`68`	`new Offset(),`
`69`	`69`	`new Order($attributes)`