CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-02 19:04:49 +12:00
Code Issues Projects Releases Wiki Activity

Added new delete attribute flow

Browse source
This commit is contained in:
Eldad Fux 2021-08-22 11:04:51 +03:00
parent 16ceb774e0
commit fa909e844d
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/api/database.php
View file

@ -86,7 +86,7 @@ $attributesCallback = function ($collectionId, $attribute, $response, $dbForInte
'key' => $attributeId,
'collectionId' => $collectionId,
'type' => $type,
'status' => 'processing', // processing, available, failed
'status' => 'processing', // processing, available, failed, deleting
'size' => $size,
'required' => $required,
'signed' => $signed,
@ -843,10 +843,7 @@ App::delete('/v1/database/collections/:collectionId/attributes/:attributeId')
throw new Exception('Attribute not found', 404);
}
if (!$dbForInternal->deleteDocument('attributes', $attribute->getId())) {
throw new Exception('Failed to remove attribute from DB', 500);
}
$attribute = $dbForInternal->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'deleting'));
$dbForInternal->purgeDocument('collections', $collectionId);
$database

27
app/workers/database.php
View file

@ -66,7 +66,6 @@ class DatabaseV1 extends Worker
$dbForExternal = $this->getExternalDB($projectId);
$collectionId = $collection->getId();
$id = $attribute->getAttribute('$id', '');
$key = $attribute->getAttribute('key', '');
$type = $attribute->getAttribute('type', '');
$size = $attribute->getAttribute('size', 0);
@ -79,12 +78,14 @@ class DatabaseV1 extends Worker
$filters = $attribute->getAttribute('filters', []);
try {
$success = $dbForExternal->createAttribute($collectionId, $key, $type, $size, $required, $default, $signed, $array, $format, $formatOptions, $filters);
if(!$dbForExternal->createAttribute($collectionId, $key, $type, $size, $required, $default, $signed, $array, $format, $formatOptions, $filters)) {
throw new Exception('Failed to create Attribute');
}
$dbForInternal->updateDocument('attributes', $id, $attribute->setAttribute('status', ($success) ? 'available' : 'failed'));
$dbForInternal->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'available'));
} catch (\Throwable $th) {
Console::error($th->getMessage());
$dbForInternal->updateDocument('attributes', $id, $attribute->setAttribute('status', 'failed'));
$dbForInternal->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'failed'));
}
$dbForInternal->purgeDocument('collections', $collectionId);
@ -97,12 +98,24 @@ class DatabaseV1 extends Worker
*/
protected function deleteAttribute(Document $collection, Document $attribute, string $projectId): void
{
$dbForInternal = $this->getInternalDB($projectId);
$dbForExternal = $this->getExternalDB($projectId);
$collectionId = $collection->getId();
$id = $attribute->getAttribute('$id');
$key = $attribute->getAttribute('key', '');
$success = $dbForExternal->deleteAttribute($collectionId, $id);
try {
if(!$dbForExternal->deleteAttribute($collectionId, $key)) {
throw new Exception('Failed to delete Attribute');
}
$dbForInternal->deleteDocument('attributes', $attribute->getId());
} catch (\Throwable $th) {
Console::error($th->getMessage());
$dbForInternal->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'failed'));
}
$dbForInternal->purgeDocument('collections', $collectionId);
}
/**

2
src/Appwrite/Utopia/Response/Model/Attribute.php
View file

@ -24,7 +24,7 @@ class Attribute extends Model
])
->addRule('status', [
'type' => self::TYPE_STRING,
'description' => 'Attribute status. Possible values: `available`, `processing`, or `failed`',
'description' => 'Attribute status. Possible values: `available`, `processing`, `deleting`, or `failed`',
'default' => '',
'example' => 'string',
])