Merge pull request #549 from utopia-php/fix-tenant

Cast tenant

Author: abnegate

src/Database/Database.php

@@ -1260,7 +1260,7 @@ public function updateCollection(string $id, array $permissions, bool $documentS
 
         if (
             $this->adapter->getSharedTables()
-            && $collection->getAttribute('$tenant') != $this->adapter->getTenant()
+            && $collection->getTenant() !== $this->adapter->getTenant()
         ) {
             throw new NotFoundException('Collection not found');
         }
@@ -1288,13 +1288,11 @@ public function getCollection(string $id): Document
     {
         $collection = $this->silent(fn () => $this->getDocument(self::METADATA, $id));
 
-        $tenant = $collection->getAttribute('$tenant');
-
         if (
             $id !== self::METADATA
             && $this->adapter->getSharedTables()
-            && $tenant !== null
-            && $tenant != $this->adapter->getTenant()
+            && $collection->getTenant() !== null
+            && $collection->getTenant() !== $this->adapter->getTenant()
         ) {
             return new Document();
         }
@@ -1341,7 +1339,7 @@ public function getSizeOfCollection(string $collection): int
             throw new NotFoundException('Collection not found');
         }
 
-        if ($this->adapter->getSharedTables() && $collection->getAttribute('$tenant') != $this->adapter->getTenant()) {
+        if ($this->adapter->getSharedTables() && $collection->getTenant() !== $this->adapter->getTenant()) {
             throw new NotFoundException('Collection not found');
         }
 
@@ -1367,7 +1365,7 @@ public function getSizeOfCollectionOnDisk(string $collection): int
             throw new NotFoundException('Collection not found');
         }
 
-        if ($this->adapter->getSharedTables() && $collection->getAttribute('$tenant') != $this->adapter->getTenant()) {
+        if ($this->adapter->getSharedTables() && $collection->getTenant() !== $this->adapter->getTenant()) {
             throw new NotFoundException('Collection not found');
         }
 
@@ -1390,7 +1388,7 @@ public function deleteCollection(string $id): bool
             throw new NotFoundException('Collection not found');
         }
 
-        if ($this->adapter->getSharedTables() && $collection->getAttribute('$tenant') != $this->adapter->getTenant()) {
+        if ($this->adapter->getSharedTables() && $collection->getTenant() !== $this->adapter->getTenant()) {
             throw new NotFoundException('Collection not found');
         }
 
@@ -3873,7 +3871,7 @@ public function updateDocument(string $collection, string $id, Document $documen
             $document['$createdAt'] = $old->getCreatedAt();                 // Make sure user doesn't switch createdAt
 
             if ($this->adapter->getSharedTables()) {
-                $document['$tenant'] = $old->getAttribute('$tenant');       // Make sure user doesn't switch tenant
+                $document['$tenant'] = $old->getTenant();       // Make sure user doesn't switch tenant
             }
 
             $document = new Document($document);

tests/e2e/Adapter/Base.php

@@ -16302,7 +16302,7 @@ public function testSharedTables(): void
 
         $doc = $database->getDocument('people', $docId);
         $this->assertEquals('Spiderman', $doc['name']);
-        $this->assertEquals($tenant1, $doc->getAttribute('$tenant'));
+        $this->assertEquals($tenant1, $doc->getTenant());
 
         /**
          * Remove Permissions
@@ -16315,7 +16315,7 @@ public function testSharedTables(): void
 
         $doc = $database->getDocument('people', $docId);
         $this->assertEquals([Permission::read(Role::any())], $doc['$permissions']);
-        $this->assertEquals($tenant1, $doc->getAttribute('$tenant'));
+        $this->assertEquals($tenant1, $doc->getTenant());
 
         /**
          * Add Permissions
@@ -16512,7 +16512,7 @@ public function testSharedTablesTenantPerDocument(): void
             ->getDocument(__FUNCTION__, $doc2Id);
 
         $this->assertEquals('Batman', $doc['name']);
-        $this->assertEquals(2, $doc->getAttribute('$tenant'));
+        $this->assertEquals(2, $doc->getTenant());
 
         // Ensure no read cross-tenant
         $docs = $database