Merge pull request #5788 from appwrite/fix-relationship-update-two-way
fixed relationship update bug in two way type
This commit is contained in:
commit
27adf0788f
2 changed files with 99 additions and 8 deletions
|
@ -327,22 +327,22 @@ function updateAttribute(
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($type === Database::VAR_RELATIONSHIP) {
|
if ($type === Database::VAR_RELATIONSHIP) {
|
||||||
$options = \array_merge($attribute->getAttribute('options', []), $options);
|
$primaryDocumentOptions = \array_merge($attribute->getAttribute('options', []), $options);
|
||||||
$attribute->setAttribute('options', $options);
|
$attribute->setAttribute('options', $primaryDocumentOptions);
|
||||||
|
|
||||||
$dbForProject->updateRelationship(
|
$dbForProject->updateRelationship(
|
||||||
collection: $collectionId,
|
collection: $collectionId,
|
||||||
id: $key,
|
id: $key,
|
||||||
onDelete: $options['onDelete'],
|
onDelete: $primaryDocumentOptions['onDelete'],
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($options['twoWay']) {
|
if ($primaryDocumentOptions['twoWay']) {
|
||||||
$relatedCollection = $dbForProject->getDocument('database_' . $db->getInternalId(), $options['relatedCollection']);
|
$relatedCollection = $dbForProject->getDocument('database_' . $db->getInternalId(), $primaryDocumentOptions['relatedCollection']);
|
||||||
$relatedAttribute = $dbForProject->getDocument('attributes', $db->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $options['twoWayKey']);
|
|
||||||
|
$relatedAttribute = $dbForProject->getDocument('attributes', $db->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $primaryDocumentOptions['twoWayKey']);
|
||||||
$relatedOptions = \array_merge($relatedAttribute->getAttribute('options'), $options);
|
$relatedOptions = \array_merge($relatedAttribute->getAttribute('options'), $options);
|
||||||
$relatedAttribute->setAttribute('options', $relatedOptions);
|
$relatedAttribute->setAttribute('options', $relatedOptions);
|
||||||
|
$dbForProject->updateDocument('attributes', $db->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $primaryDocumentOptions['twoWayKey'], $relatedAttribute);
|
||||||
$dbForProject->updateDocument('attributes', $db->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $options['twoWayKey'], $relatedAttribute);
|
|
||||||
$dbForProject->deleteCachedDocument('database_' . $db->getInternalId(), $relatedCollection->getId());
|
$dbForProject->deleteCachedDocument('database_' . $db->getInternalId(), $relatedCollection->getId());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -225,4 +225,95 @@ class DatabasesCustomClientTest extends Scope
|
||||||
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testUpdateTwoWayRelationship(): void
|
||||||
|
{
|
||||||
|
|
||||||
|
$database = $this->client->call(Client::METHOD_POST, '/databases', [
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
'x-appwrite-key' => $this->getProject()['apiKey']
|
||||||
|
], [
|
||||||
|
'databaseId' => ID::unique(),
|
||||||
|
'name' => 'Test Database'
|
||||||
|
]);
|
||||||
|
|
||||||
|
$databaseId = $database['body']['$id'];
|
||||||
|
|
||||||
|
|
||||||
|
// Creating collection 1
|
||||||
|
$collection1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
'x-appwrite-key' => $this->getProject()['apiKey']
|
||||||
|
]), [
|
||||||
|
'collectionId' => ID::unique(),
|
||||||
|
'name' => 'level1',
|
||||||
|
'documentSecurity' => false,
|
||||||
|
'permissions' => [
|
||||||
|
Permission::create(Role::user($this->getUser()['$id'])),
|
||||||
|
Permission::read(Role::user($this->getUser()['$id'])),
|
||||||
|
Permission::update(Role::user($this->getUser()['$id'])),
|
||||||
|
Permission::delete(Role::user($this->getUser()['$id'])),
|
||||||
|
]
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Creating collection 2
|
||||||
|
$collection2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
'x-appwrite-key' => $this->getProject()['apiKey']
|
||||||
|
]), [
|
||||||
|
'collectionId' => ID::unique(),
|
||||||
|
'name' => 'level2',
|
||||||
|
'documentSecurity' => false,
|
||||||
|
'permissions' => [
|
||||||
|
Permission::create(Role::user($this->getUser()['$id'])),
|
||||||
|
Permission::read(Role::user($this->getUser()['$id'])),
|
||||||
|
Permission::update(Role::user($this->getUser()['$id'])),
|
||||||
|
Permission::delete(Role::user($this->getUser()['$id'])),
|
||||||
|
]
|
||||||
|
]);
|
||||||
|
|
||||||
|
\sleep(2);
|
||||||
|
|
||||||
|
// Creating two way relationship between collection 1 and collection 2 from collection 1
|
||||||
|
$relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/attributes/relationship', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
'x-appwrite-key' => $this->getProject()['apiKey']
|
||||||
|
]), [
|
||||||
|
'relatedCollectionId' => $collection2['body']['$id'],
|
||||||
|
'type' => 'oneToMany',
|
||||||
|
'twoWay' => true,
|
||||||
|
'onDelete' => 'cascade',
|
||||||
|
'key' => $collection2['body']['$id'],
|
||||||
|
'twoWayKey' => $collection1['body']['$id']
|
||||||
|
]);
|
||||||
|
|
||||||
|
\sleep(3);
|
||||||
|
|
||||||
|
// Update relation from collection 2 to on delete restrict
|
||||||
|
$this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collection2['body']['$id'] . '/attributes/' . $collection1['body']['$id'] . '/relationship', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
'x-appwrite-key' => $this->getProject()['apiKey']
|
||||||
|
]), [
|
||||||
|
'onDelete' => 'restrict',
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Fetching attributes after updating relation to compare
|
||||||
|
$collection1Attributes = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'], [
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
'x-appwrite-key' => $this->getProject()['apiKey']
|
||||||
|
]);
|
||||||
|
|
||||||
|
$collection1RelationAttribute = $collection1Attributes['body']['attributes'][0];
|
||||||
|
|
||||||
|
$this->assertEquals($relation['body']['side'], $collection1RelationAttribute['side']);
|
||||||
|
$this->assertEquals($relation['body']['twoWayKey'], $collection1RelationAttribute['twoWayKey']);
|
||||||
|
$this->assertEquals($relation['body']['relatedCollection'], $collection1RelationAttribute['relatedCollection']);
|
||||||
|
$this->assertEquals('restrict', $collection1RelationAttribute['onDelete']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue