Skip to content

Nested relationship zoo tets #655

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

Merged
abnegate merged 9 commits into from
Aug 11, 2025
Merged

Nested relationship zoo tets #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7025fab
Zoo Tests
fogelito Aug 3, 2025
b16af0f
stopOnFailure
fogelito Aug 3, 2025
46e8a68
Merge branch 'main' of github.com:utopia-php/database into zoo-relati…
fogelito Aug 7, 2025
8581950
Check data
fogelito Aug 7, 2025
1fec267
Merge branch 'main' of github.com:utopia-php/database into zoo-relati…
fogelito Aug 7, 2025
7241f73
Run tests
fogelito Aug 7, 2025
2312756
Stop on fail
fogelito Aug 7, 2025
3e0cc09
Remove comment
fogelito Aug 7, 2025
9514f56
Run tests
fogelito Aug 10, 2025
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
12 changes: 9 additions & 3 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3324,9 +3324,15 @@ private function populateDocumentRelationships(Document $collection, Document $d
{
$attributes = $collection->getAttribute('attributes', []);

$relationships = \array_filter($attributes, function ($attribute) {
return $attribute['type'] === Database::VAR_RELATIONSHIP;
});
$relationships = [];

foreach ($attributes as $attribute) {
if ($attribute['type'] === Database::VAR_RELATIONSHIP) {
if (empty($selects) || array_key_exists($attribute['key'], $selects)) {
$relationships[] = $attribute;
}
}
}

foreach ($relationships as $relationship) {
$key = $relationship['key'];
Expand Down
193 changes: 178 additions & 15 deletions tests/e2e/Adapter/Scopes/RelationshipTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function testZoo(): void
twoWayKey: 'animals'
);

$zoo1 = $database->createDocument('zoo', new Document([
$zoo = $database->createDocument('zoo', new Document([
'$id' => 'zoo1',
'$permissions' => [
Permission::read(Role::any()),
Expand All @@ -104,7 +104,10 @@ public function testZoo(): void
'name' => 'Bronx Zoo'
]));

$animal1 = $database->createDocument('__animals', new Document([
$this->assertEquals('zoo1', $zoo->getId());
$this->assertArrayHasKey('animals', $zoo);

$iguana = $database->createDocument('__animals', new Document([
'$id' => 'iguana',
'$permissions' => [
Permission::read(Role::any()),
Expand All @@ -121,10 +124,10 @@ public function testZoo(): void
'enum' => 'maybe',
'ip' => '127.0.0.1',
'url' => 'https://appwrite.io/',
'zoo' => $zoo1->getId(),
'zoo' => $zoo->getId(),
]));

$animal2 = $database->createDocument('__animals', new Document([
$tiger = $database->createDocument('__animals', new Document([
'$id' => 'tiger',
'$permissions' => [
Permission::read(Role::any()),
Expand All @@ -141,10 +144,10 @@ public function testZoo(): void
'enum' => 'yes',
'ip' => '255.0.0.1',
'url' => 'https://appwrite.io/',
'zoo' => $zoo1->getId(),
'zoo' => $zoo->getId(),
]));

$animal3 = $database->createDocument('__animals', new Document([
$lama = $database->createDocument('__animals', new Document([
'$id' => 'lama',
'$permissions' => [
Permission::read(Role::any()),
Expand Down Expand Up @@ -183,7 +186,7 @@ public function testZoo(): void
'animals' => ['tiger'],
]));

$president1 = $database->createDocument('presidents', new Document([
$trump = $database->createDocument('presidents', new Document([
'$id' => 'trump',
'$permissions' => [
Permission::read(Role::any()),
Expand All @@ -197,7 +200,7 @@ public function testZoo(): void
],
]));

$president2 = $database->createDocument('presidents', new Document([
$bush = $database->createDocument('presidents', new Document([
'$id' => 'bush',
'$permissions' => [
Permission::read(Role::any()),
Expand All @@ -208,7 +211,7 @@ public function testZoo(): void
'animal' => 'iguana',
]));

$president3 = $database->createDocument('presidents', new Document([
$biden = $database->createDocument('presidents', new Document([
'$id' => 'biden',
'$permissions' => [
Permission::read(Role::any()),
Expand All @@ -219,23 +222,183 @@ public function testZoo(): void
'animal' => 'tiger',
]));

var_dump('=== start === === start === === start === === start === === start === === start === === start === === start === === start ===');
/**
* Check Zoo data
*/
$zoo = $database->getDocument('zoo', 'zoo1');

$this->assertEquals('zoo1', $zoo->getId());
$this->assertEquals('Bronx Zoo', $zoo->getAttribute('name'));
$this->assertArrayHasKey('animals', $zoo);
$this->assertEquals(2, count($zoo->getAttribute('animals')));
$this->assertArrayHasKey('president', $zoo->getAttribute('animals')[0]);
$this->assertArrayHasKey('veterinarian', $zoo->getAttribute('animals')[0]);

$zoo = $database->findOne('zoo');

$this->assertEquals('zoo1', $zoo->getId());
$this->assertEquals('Bronx Zoo', $zoo->getAttribute('name'));
$this->assertArrayHasKey('animals', $zoo);
$this->assertEquals(2, count($zoo->getAttribute('animals')));
$this->assertArrayHasKey('president', $zoo->getAttribute('animals')[0]);
$this->assertArrayHasKey('veterinarian', $zoo->getAttribute('animals')[0]);

/**
* Check Veterinarians data
*/
$veterinarian = $database->getDocument('veterinarians', 'dr.pol');

$this->assertEquals('dr.pol', $veterinarian->getId());
$this->assertArrayHasKey('presidents', $veterinarian);
$this->assertEquals(1, count($veterinarian->getAttribute('presidents')));
$this->assertArrayHasKey('animal', $veterinarian->getAttribute('presidents')[0]);
$this->assertArrayHasKey('animals', $veterinarian);
$this->assertEquals(1, count($veterinarian->getAttribute('animals')));
$this->assertArrayHasKey('zoo', $veterinarian->getAttribute('animals')[0]);
$this->assertArrayHasKey('president', $veterinarian->getAttribute('animals')[0]);

$veterinarian = $database->findOne('veterinarians', [
Query::equal('$id', ['dr.pol'])
]);

$this->assertEquals('dr.pol', $veterinarian->getId());
$this->assertArrayHasKey('presidents', $veterinarian);
$this->assertEquals(1, count($veterinarian->getAttribute('presidents')));
$this->assertArrayHasKey('animal', $veterinarian->getAttribute('presidents')[0]);
$this->assertArrayHasKey('animals', $veterinarian);
$this->assertEquals(1, count($veterinarian->getAttribute('animals')));
$this->assertArrayHasKey('zoo', $veterinarian->getAttribute('animals')[0]);
$this->assertArrayHasKey('president', $veterinarian->getAttribute('animals')[0]);

/**
* Check Animals data
*/
$animal = $database->getDocument('__animals', 'iguana');

$this->assertEquals('iguana', $animal->getId());
$this->assertArrayHasKey('zoo', $animal);
$this->assertEquals('Bronx Zoo', $animal['zoo']->getAttribute('name'));
$this->assertArrayHasKey('veterinarian', $animal);
$this->assertEquals('dr.pol', $animal['veterinarian']->getId());
$this->assertArrayHasKey('presidents', $animal['veterinarian']);
$this->assertArrayHasKey('president', $animal);
$this->assertEquals('bush', $animal['president']->getId());

$animal = $database->findOne('__animals', [
Query::equal('$id', ['tiger'])
]);

$this->assertEquals('tiger', $animal->getId());
$this->assertArrayHasKey('zoo', $animal);
$this->assertEquals('Bronx Zoo', $animal['zoo']->getAttribute('name'));
$this->assertArrayHasKey('veterinarian', $animal);
$this->assertEquals('dr.seuss', $animal['veterinarian']->getId());
$this->assertArrayHasKey('presidents', $animal['veterinarian']);
$this->assertArrayHasKey('president', $animal);
$this->assertEquals('biden', $animal['president']->getId());

/**
* Check President data
*/
$president = $database->getDocument('presidents', 'trump');

$this->assertEquals('trump', $president->getId());
$this->assertArrayHasKey('animal', $president);
$this->assertArrayHasKey('votes', $president);
$this->assertEquals(2, count($president['votes']));

/**
* Check President data
*/
$president = $database->findOne('presidents', [
Query::equal('$id', ['bush'])
]);

$this->assertEquals('bush', $president->getId());
$this->assertArrayHasKey('animal', $president);
$this->assertArrayHasKey('votes', $president);
$this->assertEquals(0, count($president['votes']));

$docs = $database->find(
$president = $database->findOne('presidents', [
Query::select([
'*',
'votes.*',
]),
Query::equal('$id', ['trump'])
]);

$this->assertEquals('trump', $president->getId());
$this->assertArrayHasKey('votes', $president);
$this->assertEquals(2, count($president['votes']));
$this->assertArrayNotHasKey('animals', $president['votes'][0]); // Not exist

$president = $database->findOne('presidents', [
Query::select([
'*',
'votes.*',
'votes.animals.*',
]),
Query::equal('$id', ['trump'])
]);

$this->assertEquals('trump', $president->getId());
$this->assertArrayHasKey('votes', $president);
$this->assertEquals(2, count($president['votes']));
$this->assertArrayHasKey('animals', $president['votes'][0]); // Exist

/**
* Check Selects queries
*/
$veterinarian = $database->findOne('veterinarians', [
Query::select(['*']), // No resolving
Query::equal('$id', ['dr.pol']),
]);

$this->assertEquals('dr.pol', $veterinarian->getId());
$this->assertArrayNotHasKey('presidents', $veterinarian);
$this->assertArrayNotHasKey('animals', $veterinarian);

$veterinarian = $database->findOne(
'veterinarians',
[
Query::select([
'animals.*',
])
]
);

$this->assertEquals('dr.pol', $veterinarian->getId());
$this->assertArrayHasKey('animals', $veterinarian);
$this->assertArrayNotHasKey('presidents', $veterinarian);

$animal = $veterinarian['animals'][0];

$this->assertArrayHasKey('president', $animal);
$this->assertEquals('bush', $animal->getAttribute('president')); // Check president is a value
$this->assertArrayHasKey('zoo', $animal);
$this->assertEquals('zoo1', $animal->getAttribute('zoo')); // Check zoo is a value

$veterinarian = $database->findOne(
'veterinarians',
[
Query::select([
'*',
'animals.*',
'animals.zoo.*',
//'animals.president.*',
'animals.president.*',
])
]
);

var_dump($docs);
$this->assertEquals('dr.pol', $veterinarian->getId());
$this->assertArrayHasKey('animals', $veterinarian);
$this->assertArrayNotHasKey('presidents', $veterinarian);

$animal = $veterinarian['animals'][0];

//$this->assertEquals('shmuel', 'fogel');
$this->assertArrayHasKey('president', $animal);
$this->assertEquals('Bush', $animal->getAttribute('president')->getAttribute('last_name')); // Check president is an object
$this->assertArrayHasKey('zoo', $animal);
$this->assertEquals('Bronx Zoo', $animal->getAttribute('zoo')->getAttribute('name')); // Check zoo is an object
}

public function testDeleteRelatedCollection(): void
Expand Down