Merge pull request #645 from utopia-php/fix-encode-permissions

Fix encode permissions

Author: abnegate

src/Database/Database.php

@@ -3615,6 +3615,10 @@ public function createDocument(string $collection, Document $document): Document
             ->setAttribute('$createdAt', ($createdAt === null || !$this->preserveDates) ? $time : $createdAt)
             ->setAttribute('$updatedAt', ($updatedAt === null || !$this->preserveDates) ? $time : $updatedAt);
 
+        if (empty($document->getPermissions())) {
+            $document->setAttribute('$permissions', []);
+        }
+
         if ($this->adapter->getSharedTables()) {
             if ($this->adapter->getTenantPerDocument()) {
                 if (
@@ -3715,6 +3719,10 @@ public function createDocuments(
                 ->setAttribute('$createdAt', ($createdAt === null || !$this->preserveDates) ? $time : $createdAt)
                 ->setAttribute('$updatedAt', ($updatedAt === null || !$this->preserveDates) ? $time : $updatedAt);
 
+            if (empty($document->getPermissions())) {
+                $document->setAttribute('$permissions', []);
+            }
+
             if ($this->adapter->getSharedTables()) {
                 if ($this->adapter->getTenantPerDocument()) {
                     if ($document->getTenant() === null) {
@@ -4456,6 +4464,7 @@ public function updateDocuments(
 
                     $document = $this->encode($collection, $document);
                 }
+
                 $this->adapter->updateDocuments(
                     $collection->getId(),
                     $updates,
@@ -6350,9 +6359,6 @@ public function encode(Document $collection, Document $document): Document
             }
 
             if ($key === '$permissions') {
-                if (empty($value)) {
-                    $document->setAttribute('$permissions', []); // set default value
-                }
                 continue;
             }
 
@@ -6433,6 +6439,10 @@ public function decode(Document $collection, Document $document, array $selectio
             $filters = $attribute['filters'] ?? [];
             $value = $document->getAttribute($key);
 
+            if ($key === '$permissions') {
+                continue;
+            }
+
             if (\is_null($value)) {
                 $value = $document->getAttribute($this->adapter->filter($key));
 
@@ -6492,6 +6502,10 @@ public function casting(Document $collection, Document $document): Document
                 continue;
             }
 
+            if ($key === '$permissions') {
+                continue;
+            }
+
             if ($array) {
                 $value = !is_string($value)
                     ? $value

src/Database/Document.php

@@ -278,9 +278,7 @@ public function setAttributes(array $attributes): static
      */
     public function removeAttribute(string $key): static
     {
-        if (\array_key_exists($key, (array)$this)) {
-            unset($this[$key]);
-        }
+        unset($this[$key]);
 
         /* @phpstan-ignore-next-line */
         return $this;

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -543,6 +543,11 @@ public function testSkipPermissions(): void
 
         $this->assertEquals(2, \count($results));
         $this->assertEquals(2, $count);
+
+        foreach ($results as $result) {
+            $this->assertArrayHasKey('$permissions', $result);
+            $this->assertEquals([], $result->getAttribute('$permissions'));
+        }
     }
 
     public function testUpsertDocuments(): void