Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add test for invalid keys #308

Merged
merged 4 commits into from
Aug 17, 2023
Merged

Add test for invalid keys #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a96134e
Add test for invalid keys
abnegate Aug 17, 2023
947f43b
fix no invalid keys
fanatic75 Aug 17, 2023
6d1a621
lint fix
fanatic75 Aug 17, 2023
6c53a71
adds missing comment back
fanatic75 Aug 17, 2023
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
5 changes: 5 additions & 0 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2920,6 +2920,11 @@ public function updateDocument(string $collection, string $id, Document $documen

$time = DateTime::now();
$old = Authorization::skip(fn () => $this->silent(fn () => $this->getDocument($collection, $id))); // Skip ensures user does not need read permission for this
$document = \array_merge($old->getArrayCopy(), $document->getArrayCopy());
$document['$collection'] = $old->getAttribute('$collection'); // Make sure user doesn't switch collectionID
$document['$createdAt'] = $old->getCreatedAt(); // Make sure user doesn't switch createdAt
$document['$id'] = $old->getId();
$document = new Document($document);

$collection = $this->silent(fn () => $this->getCollection($collection));
$relationships = \array_filter($collection->getAttribute('attributes', []), function ($attribute) {
Expand Down
75 changes: 72 additions & 3 deletions tests/Database/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Datetime as DatetimeValidator;
use Utopia\Database\Validator\Index;
use Utopia\Database\Validator\Query\Filter;
use Utopia\Database\Validator\Structure;
use Utopia\Validator\Range;
use Utopia\Database\Exception\Structure as StructureException;
Expand Down Expand Up @@ -4415,6 +4414,76 @@ public function testWritePermissions(): void
$this->assertEquals('newCat', $docs[0]['type']);
}

public function testNoInvalidKeysWithRelationships(): void
{
if (!static::getDatabase()->getAdapter()->getSupportForRelationships()) {
$this->expectNotToPerformAssertions();
return;
}
static::getDatabase()->createCollection('species');
static::getDatabase()->createCollection('creatures');
static::getDatabase()->createCollection('characterstics');

static::getDatabase()->createAttribute('species', 'name', Database::VAR_STRING, 255, true);
static::getDatabase()->createAttribute('creatures', 'name', Database::VAR_STRING, 255, true);
static::getDatabase()->createAttribute('characterstics', 'name', Database::VAR_STRING, 255, true);

static::getDatabase()->createRelationship(
collection: 'species',
relatedCollection: 'creatures',
type: Database::RELATION_ONE_TO_ONE,
twoWay: true,
id: 'creature',
twoWayKey:'species'
);
static::getDatabase()->createRelationship(
collection: 'creatures',
relatedCollection: 'characterstics',
type: Database::RELATION_ONE_TO_ONE,
twoWay: true,
id: 'characterstic',
twoWayKey:'creature'
);

$species = static::getDatabase()->createDocument('species', new Document([
'$id' => ID::custom('1'),
'$permissions' => [
Permission::read(Role::any()),
],
'name' => 'Canine',
'creature' => [
'$id' => ID::custom('1'),
'$permissions' => [
Permission::read(Role::any()),
],
'name' => 'Dog',
'characterstic' => [
'$id' => ID::custom('1'),
'$permissions' => [
Permission::read(Role::any()),
Permission::update(Role::any()),
],
'name' => 'active',
]
]
]));
static::getDatabase()->updateDocument('species', $species->getId(), new Document([
'$id' => ID::custom('1'),
'$collection' => 'species',
'creature' => [
'$id' => ID::custom('1'),
'$collection' => 'creatures',
'characterstic' => [
'$id' => ID::custom('1'),
'name' => 'active',
'$collection' => 'characterstics',
]
]
]));
$updatedSpecies = static::getDatabase()->getDocument('species', $species->getId());
$this->assertEquals($species, $updatedSpecies);
}

// Relationships
public function testOneToOneOneWayRelationship(): void
{
Expand Down Expand Up @@ -4913,12 +4982,12 @@ public function testOneToOneTwoWayRelationship(): void
$this->assertEquals('London', $country1->getAttribute('city')->getAttribute('name'));

// Update a document with non existing related document. It should not get added to the list.
static::getDatabase()->updateDocument('country', 'country1', $doc->setAttribute('city', 'no-city'));
static::getDatabase()->updateDocument('country', 'country1', (new Document($doc->getArrayCopy()))->setAttribute('city', 'no-city'));

$country1Document = static::getDatabase()->getDocument('country', 'country1');
// Assert document does not contain non existing relation document.
$this->assertEquals(null, $country1Document->getAttribute('city'));
static::getDatabase()->updateDocument('country', 'country1', $doc->setAttribute('city', 'city1'));
static::getDatabase()->updateDocument('country', 'country1', (new Document($doc->getArrayCopy()))->setAttribute('city', 'city1'));
try {
static::getDatabase()->deleteDocument('country', 'country1');
$this->fail('Failed to throw exception');
Expand Down