CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-27 18:50:47 +12:00
Code Issues Projects Releases Wiki Activity

Remove conflicts

Browse source
This commit is contained in:
Jake Barnby 2023-03-30 13:01:58 +13:00
parent 9025f97939
commit 9468c238de
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
5 changed files with 11 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/databases.php
View file

@ -153,7 +153,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
'collectionInternalId' => $relatedCollection->getInternalId(),
'collectionId' => $relatedCollection->getId(),
'type' => $type,
'status' => 'available', // processing, available, failed, deleting, stuck
'status' => 'processing', // processing, available, failed, deleting, stuck
'size' => $size,
'required' => $required,
'signed' => $signed,

48
app/workers/databases.php
View file

@ -94,7 +94,6 @@ class DatabaseV1 extends Worker
$options = $attribute->getAttribute('options', []);
$project = $dbForConsole->getDocument('projects', $projectId);
$related = null;
try {
switch ($type) {
case Database::VAR_RELATIONSHIP:
@ -102,6 +101,7 @@ class DatabaseV1 extends Worker
if ($relatedCollection->isEmpty()) {
throw new Exception('Collection not found');
}
if (
!$dbForProject->createRelationship(
collection: 'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
@ -116,41 +116,10 @@ class DatabaseV1 extends Worker
throw new Exception('Failed to create Attribute');
}
$metadata = $dbForProject->getCollection('database_' . $database->getInternalId() . '_collection_' . $relatedCollection->getInternalId());
$related = \array_filter($metadata->getAttribute('attributes', []), function ($a) use ($options) {
return $a['$id'] === $options['twoWayKey'];
});
/**
* @var Document $related
*/
$related = end($related);
$options = $related->getAttribute('options', []);
$options['relatedCollection'] = $collection->getId();
$related = new Document([
'$id' => ID::custom($database->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $related->getId()),
'key' => $related->getId(),
'databaseInternalId' => $database->getInternalId(),
'databaseId' => $database->getId(),
'collectionInternalId' => $relatedCollection->getInternalId(),
'collectionId' => $relatedCollection->getId(),
'status' => 'available',
'type' => Database::VAR_RELATIONSHIP,
'size' => 0,
'required' => false,
'default' => null,
'array' => false,
'filters' => [],
'signed' => false,
'format' => '',
'formatOptions' => [],
'options' => $options,
]);
$related = $dbForProject->createDocument('attributes', $related);
if ($options['twoWay']) {
$relatedAttribute = $dbForProject->getDocument('attributes', $database->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $options['twoWayKey']);
$dbForProject->updateDocument('attributes', $relatedAttribute->getId(), $relatedAttribute->setAttribute('status', 'available'));
}
break;
default:
if (!$dbForProject->createAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key, $type, $size, $required, $default, $signed, $array, $format, $formatOptions, $filters)) {
@ -159,14 +128,13 @@ class DatabaseV1 extends Worker
}
$dbForProject->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'available'));
// todo: needs to clean cache for related colllection?
} catch (\Throwable $th) {
Console::error($th->getMessage());
$dbForProject->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'failed'));
if (Database::VAR_RELATIONSHIP === $type) {
$dbForProject->updateDocument('attributes', $related->getId(), $related->setAttribute('status', 'failed'));
if ($type === Database::VAR_RELATIONSHIP && $options['twoWay']) {
$relatedAttribute = $dbForProject->getDocument('attributes', $database->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $options['twoWayKey']);
$dbForProject->updateDocument('attributes', $relatedAttribute->getId(), $relatedAttribute->setAttribute('status', 'failed'));
}
} finally {
$target = Realtime::fromPayload(

2
composer.json
View file

@ -63,7 +63,7 @@
"utopia-php/swoole": "0.5.*",
"utopia-php/websocket": "0.1.*",
"resque/php-resque": "1.3.6",
"matomo/device-detector": "6.0.0",
"matomo/device-detector": "6.0.*",
"dragonmantank/cron-expression": "3.3.1",
"influxdb/influxdb-php": "1.15.2",
"phpmailer/phpmailer": "6.6.0",

2
phpunit.xml
View file

@ -6,7 +6,7 @@
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="true"
stopOnFailure="false"
>
<extensions>
<extension class="Appwrite\Tests\TestHook" />

2
tests/e2e/Services/Databases/DatabasesBase.php
View file

@ -3439,8 +3439,6 @@ trait DatabasesBase
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]));
var_dump($libraryAttributesResponse);
die;
$this->assertIsArray($libraryAttributesResponse['body']['attributes']);
$this->assertEquals(2, $libraryAttributesResponse['body']['total']); // currently = 1