Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/Database/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -3609,6 +3609,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 (
Expand Down Expand Up @@ -3708,6 +3712,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) {
Expand Down Expand Up @@ -4445,6 +4453,7 @@ public function updateDocuments(

$document = $this->encode($collection, $document);
}

$this->adapter->updateDocuments(
$collection->getId(),
$updates,
Expand Down Expand Up @@ -6334,9 +6343,9 @@ public function encode(Document $collection, Document $document): Document
}

if ($key === '$permissions') {
if (empty($value)) {
$document->setAttribute('$permissions', []); // set default value
}
// if (empty($value)) {
// $document->setAttribute('$permissions', []); // set default value
// }
continue;
}

Expand Down
4 changes: 1 addition & 3 deletions src/Database/Document.php
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to check + copy array since unset is silent


/* @phpstan-ignore-next-line */
return $this;
Expand Down
5 changes: 5 additions & 0 deletions tests/e2e/Adapter/Scopes/DocumentTests.php
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,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
Expand Down
121 changes: 120 additions & 1 deletion tests/e2e/Adapter/Scopes/PermissionTests.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,126 @@

trait PermissionTests
{
public function testCreateDocumentsEmptyPermission(): void
public function testUnsetPermissions(): void
{
/** @var Database $database */
$database = static::getDatabase();

$database->createCollection(__FUNCTION__);
$this->assertTrue($database->createAttribute(
collection: __FUNCTION__,
id: 'president',
type: Database::VAR_STRING,
size: 255,
required: false
));

$permissions = [
Permission::read(Role::any()),
Permission::create(Role::any()),
Permission::update(Role::any()),
Permission::delete(Role::any()),
];

$documents = [];

for ($i = 0; $i < 3; $i++) {
$documents[] = new Document([
'$permissions' => $permissions,
'president' => 'Donald Trump'
]);
}

/**
* @var $results Array<Document>
*/
$results = [];
$count = $database->createDocuments(__FUNCTION__, $documents, onNext: function ($doc) use (&$results) {
$results[] = $doc;
});

$this->assertEquals(3, $count);

foreach ($results as $result) {
$this->assertEquals('Donald Trump', $result->getAttribute('president'));
$this->assertEquals($permissions, $result->getPermissions());
}

/**
* No permissions passed, Check old is preserved
*/
$updates = new Document([
'president' => 'George Washington'
]);

/**
* @var $results Array<Document>
*/
$results = [];
$modified = $database->updateDocuments(
__FUNCTION__,
$updates,
onNext: function ($doc) use (&$results) {
$results[] = $doc;
}
);

$this->assertEquals(3, $modified);

foreach ($results as $result) {
$this->assertEquals('George Washington', $result->getAttribute('president'));
$this->assertEquals($permissions, $result->getPermissions());
}

$documents = $database->find(__FUNCTION__);

$this->assertEquals(3, count($documents));

foreach ($documents as $document) {
$this->assertEquals('George Washington', $document->getAttribute('president'));
$this->assertEquals($permissions, $document->getPermissions());
}

/**
* Unset permissions
*/
$updates = new Document([
'$permissions' => [],
'president' => 'Richard Nixon'
]);

/**
* @var $results Array<Document>
*/
$results = [];
$modified = $database->updateDocuments(
__FUNCTION__,
$updates,
onNext: function ($doc) use (&$results) {
$results[] = $doc;
}
);

$this->assertEquals(3, $modified);

foreach ($results as $result) {
$this->assertEquals('Richard Nixon', $result->getAttribute('president'));
$this->assertEquals([], $result->getPermissions());
}

$documents = $database->find(__FUNCTION__);

$this->assertEquals(3, count($documents));

foreach ($documents as $document) {
$this->assertEquals('Richard Nixon', $document->getAttribute('president'));
$this->assertEquals([], $document->getPermissions());
}

$this->assertEquals('shmuel', 'fogel');
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
}

public function testCreateDocumentsEmptyPermission(): void
{
/** @var Database $database */
$database = static::getDatabase();
Expand Down
Loading