Init V2 validators

utopia-php · Oct 29, 2024 · a87eed3 · a87eed3
1 parent c7af565
commit a87eed3
Show file tree

Hide file tree

Showing 6 changed files with 452 additions and 42 deletions.
diff --git a/src/Database/Database.php b/src/Database/Database.php
@@ -21,7 +21,7 @@
 use Utopia\Database\Validator\Index as IndexValidator;
 use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\Queries\Document as DocumentValidator;
-use Utopia\Database\Validator\Queries\Documents as DocumentsValidator;
+use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
 use Utopia\Database\Validator\Structure;
 
 class Database
@@ -5006,11 +5006,17 @@ public function find(string $collection, array $queries = []): array
             throw new DatabaseException('Collection not found');
         }
 
-        $attributes = $collection->getAttribute('attributes', []);
-        $indexes = $collection->getAttribute('indexes', []);
-
         if ($this->validate) {
-            $validator = new DocumentsValidator($attributes, $indexes);
+            $collections[] = $collection;
+
+            $joins = Query::getByType($queries, [Query::TYPE_JOIN]);
+            var_dump($joins);
+            $collections = [];
+            foreach ($joins as $join) {
+                $collections[] = $this->silent(fn () => $this->getCollection($join->getCollection()));
+            }
+
+            $validator = new DocumentsValidator($collections);
             if (!$validator->isValid($queries)) {
                 throw new QueryException($validator->getDescription());
             }

diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -693,6 +693,7 @@ public static function getByType(array $queries, array $types): array
     public static function groupByType(array $queries): array
     {
         $filters = [];
+        $joins = [];
         $selections = [];
         $limit = null;
         $offset = null;
@@ -753,6 +754,10 @@ public static function groupByType(array $queries): array
                     $selections[] = clone $query;
                     break;
 
+                case Query::TYPE_JOIN:
+                    $joins[] = clone $query;
+                    break;
+
                 default:
                     $filters[] = clone $query;
                     break;
@@ -768,6 +773,7 @@ public static function groupByType(array $queries): array
             'orderTypes' => $orderTypes,
             'cursor' => $cursor,
             'cursorDirection' => $cursorDirection,
+            'join' => $joins,
         ];
     }
 

diff --git a/src/Database/Validator/Queries/Documents.php b/src/Database/Validator/Queries/Documents.php
@@ -23,43 +23,43 @@ class Documents extends IndexedQueries
      * @param array<mixed> $indexes
      * @throws Exception
      */
-    public function __construct(array $attributes, array $indexes)
+    public function __construct(array $collections)
     {
-        $attributes[] = new Document([
-            '$id' => '$id',
-            'key' => '$id',
-            'type' => Database::VAR_STRING,
-            'array' => false,
-        ]);
-        $attributes[] = new Document([
-            '$id' => '$internalId',
-            'key' => '$internalId',
-            'type' => Database::VAR_STRING,
-            'array' => false,
-        ]);
-        $attributes[] = new Document([
-            '$id' => '$createdAt',
-            'key' => '$createdAt',
-            'type' => Database::VAR_DATETIME,
-            'array' => false,
-        ]);
-        $attributes[] = new Document([
-            '$id' => '$updatedAt',
-            'key' => '$updatedAt',
-            'type' => Database::VAR_DATETIME,
-            'array' => false,
-        ]);
+//        $attributes[] = new Document([
+//            '$id' => '$id',
+//            'key' => '$id',
+//            'type' => Database::VAR_STRING,
+//            'array' => false,
+//        ]);
+//        $attributes[] = new Document([
+//            '$id' => '$internalId',
+//            'key' => '$internalId',
+//            'type' => Database::VAR_STRING,
+//            'array' => false,
+//        ]);
+//        $attributes[] = new Document([
+//            '$id' => '$createdAt',
+//            'key' => '$createdAt',
+//            'type' => Database::VAR_DATETIME,
+//            'array' => false,
+//        ]);
+//        $attributes[] = new Document([
+//            '$id' => '$updatedAt',
+//            'key' => '$updatedAt',
+//            'type' => Database::VAR_DATETIME,
+//            'array' => false,
+//        ]);
 
         $validators = [
             new Limit(),
             new Offset(),
             new Cursor(),
-            new Filter($attributes),
-            new Order($attributes),
-            new Select($attributes),
-            new Join($attributes),
+            new Filter($collections),
+            new Order($collections),
+            new Select($collections),
+            new Join($collections),
         ];
 
-        parent::__construct($attributes, $indexes, $validators);
+        parent::__construct($collections, $validators);
     }
 }