(fix): add collection read permissions for joins, use enums in e2e tests

Author: abnegate

tests/e2e/Adapter/Scopes/AggregationTests.php

@@ -38,7 +38,7 @@ private function createProducts(Database $database, string $collection = 'agg_pr
             return;
         }
 
-        $database->createCollection($collection);
+        $database->createCollection($collection, permissions: [Permission::create(Role::any()), Permission::read(Role::any())]);
         $database->createAttribute($collection, new Attribute(key: 'name', type: ColumnType::String, size: 100, required: true));
         $database->createAttribute($collection, new Attribute(key: 'category', type: ColumnType::String, size: 50, required: true));
         $database->createAttribute($collection, new Attribute(key: 'price', type: ColumnType::Integer, size: 0, required: true));
@@ -74,7 +74,7 @@ private function createOrders(Database $database, string $collection = 'agg_orde
             $database->deleteCollection($collection);
         }
 
-        $database->createCollection($collection);
+        $database->createCollection($collection, permissions: [Permission::create(Role::any()), Permission::read(Role::any())]);
         $database->createAttribute($collection, new Attribute(key: 'product_uid', type: ColumnType::String, size: 255, required: true));
         $database->createAttribute($collection, new Attribute(key: 'customer_uid', type: ColumnType::String, size: 255, required: true));
         $database->createAttribute($collection, new Attribute(key: 'quantity', type: ColumnType::Integer, size: 0, required: true));
@@ -111,7 +111,7 @@ private function createCustomers(Database $database, string $collection = 'agg_c
             $database->deleteCollection($collection);
         }
 
-        $database->createCollection($collection);
+        $database->createCollection($collection, permissions: [Permission::create(Role::any()), Permission::read(Role::any())]);
         $database->createAttribute($collection, new Attribute(key: 'name', type: ColumnType::String, size: 100, required: true));
         $database->createAttribute($collection, new Attribute(key: 'email', type: ColumnType::String, size: 200, required: true));
         $database->createAttribute($collection, new Attribute(key: 'country', type: ColumnType::String, size: 50, required: true));
@@ -142,7 +142,7 @@ private function createReviews(Database $database, string $collection = 'agg_rev
             $database->deleteCollection($collection);
         }
 
-        $database->createCollection($collection);
+        $database->createCollection($collection, permissions: [Permission::create(Role::any()), Permission::read(Role::any())]);
         $database->createAttribute($collection, new Attribute(key: 'product_uid', type: ColumnType::String, size: 255, required: true));
         $database->createAttribute($collection, new Attribute(key: 'customer_uid', type: ColumnType::String, size: 255, required: true));
         $database->createAttribute($collection, new Attribute(key: 'score', type: ColumnType::Integer, size: 0, required: true));
@@ -258,7 +258,7 @@ public function testCountEmptyCollection(): void
         if ($database->exists($database->getDatabase(), $col)) {
             $database->deleteCollection($col);
         }
-        $database->createCollection($col);
+        $database->createCollection($col, permissions: [Permission::create(Role::any()), Permission::read(Role::any())]);
         $database->createAttribute($col, new Attribute(key: 'value', type: ColumnType::Integer, size: 0, required: true));
 
         $results = $database->find($col, [Query::count('*', 'total')]);
@@ -1106,9 +1106,9 @@ public function testJoinAggregationWithPermissionsGrouped(): void
         $cols = ['jp_apg_o', 'jp_apg_c'];
         $this->cleanupAggCollections($database, $cols);
 
-        $database->createCollection('jp_apg_c');
+        $database->createCollection('jp_apg_c', permissions: [Permission::create(Role::any()), Permission::read(Role::any())]);
         $database->createAttribute('jp_apg_c', new Attribute(key: 'name', type: ColumnType::String, size: 100, required: true));
-        $database->createCollection('jp_apg_o', documentSecurity: true);
+        $database->createCollection('jp_apg_o', permissions: [Permission::create(Role::any()), Permission::read(Role::any())], documentSecurity: true);
         $database->createAttribute('jp_apg_o', new Attribute(key: 'customer_uid', type: ColumnType::String, size: 255, required: true));
         $database->createAttribute('jp_apg_o', new Attribute(key: 'amount', type: ColumnType::Integer, size: 0, required: true));
 
@@ -1173,9 +1173,9 @@ public function testLeftJoinPermissionFiltered(): void
         $cols = ['jp_ljpf_p', 'jp_ljpf_r'];
         $this->cleanupAggCollections($database, $cols);
 
-        $database->createCollection('jp_ljpf_p', documentSecurity: true);
+        $database->createCollection('jp_ljpf_p', permissions: [Permission::create(Role::any()), Permission::read(Role::any())], documentSecurity: true);
         $database->createAttribute('jp_ljpf_p', new Attribute(key: 'name', type: ColumnType::String, size: 100, required: true));
-        $database->createCollection('jp_ljpf_r');
+        $database->createCollection('jp_ljpf_r', permissions: [Permission::create(Role::any()), Permission::read(Role::any())]);
         $database->createAttribute('jp_ljpf_r', new Attribute(key: 'product_uid', type: ColumnType::String, size: 255, required: true));
         $database->createAttribute('jp_ljpf_r', new Attribute(key: 'score', type: ColumnType::Integer, size: 0, required: true));
 

tests/e2e/Adapter/Scopes/AttributeTests.php

@@ -599,7 +599,7 @@ public function testUpdateAttributeFormat(): void
             $max = $attribute['formatOptions']['max'];
 
             return new Range($min, $max);
-        }, ColumnType::Integer->value);
+        }, ColumnType::Integer);
 
         $database->updateAttributeFormat($this->getFlowersCollection(), 'price', 'priceRange');
         $database->updateAttributeFormatOptions($this->getFlowersCollection(), 'price', ['min' => 1, 'max' => 10000]);
@@ -674,7 +674,7 @@ protected function initFlowersWithPriceFixture(): void
             $max = $attribute['formatOptions']['max'];
 
             return new Range($min, $max);
-        }, ColumnType::Integer->value);
+        }, ColumnType::Integer);
 
         $database->updateAttributeFormat($this->getFlowersCollection(), 'price', 'priceRange');
         $database->updateAttributeFormatOptions($this->getFlowersCollection(), 'price', ['min' => 1, 'max' => 10000]);
@@ -693,7 +693,7 @@ public function testUpdateAttributeStructure(): void
             $max = $attribute['formatOptions']['max'];
 
             return new Range($min, $max);
-        }, ColumnType::Integer->value);
+        }, ColumnType::Integer);
 
         /** @var Database $database */
         $database = $this->getDatabase();

tests/e2e/Adapter/Scopes/CollectionTests.php

@@ -19,7 +19,7 @@
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Hook\Lifecycle;
-use Utopia\Database\Hook\QueryTransform;
+use Utopia\Database\Hook\Transform;
 use Utopia\Database\Index;
 use Utopia\Database\Query;
 use Utopia\Database\Relationship;
@@ -1081,7 +1081,7 @@ public function testEvents(): void
             ];
 
             $test = $this;
-            $database->addLifecycleHook(new class ($events, $test) implements Lifecycle {
+            $database->addHook(new class ($events, $test) implements Lifecycle {
                 /** @param array<Event> $events */
                 public function __construct(private array &$events, private $test)
                 {
@@ -1222,7 +1222,7 @@ public function testTransformations(): void
             'name' => 'value1',
         ]));
 
-        $database->addQueryTransform('test', new class () implements QueryTransform {
+        $database->addHook(new class () implements Transform {
             public function transform(Event $event, string $query): string
             {
                 return 'SELECT 1';