Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2599 from appwrite/fix-create-existing-collection

Browse source 
Fix: 409 for createCollection
This commit is contained in:
Eldad A. Fux 2022-01-27 00:17:56 +02:00 committed by GitHub
commit 23df3a10ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,8 +166,6 @@ App::post('/v1/database/collections')
$collectionId = $collectionId == 'unique()' ? $dbForProject->getId() : $collectionId; $collectionId = $collectionId == 'unique()' ? $dbForProject->getId() : $collectionId;
try { try {
$dbForProject->createCollection('collection_' . $collectionId);
$collection = $dbForProject->createDocument('collections', new Document([ $collection = $dbForProject->createDocument('collections', new Document([
'$id' => $collectionId, '$id' => $collectionId,
'$read' => $read ?? [], // Collection permissions for collection documents (based on permission model) '$read' => $read ?? [], // Collection permissions for collection documents (based on permission model)
@ -179,8 +177,12 @@ App::post('/v1/database/collections')
'name' => $name, 'name' => $name,
'search' => implode(' ', [$collectionId, $name]), 'search' => implode(' ', [$collectionId, $name]),
])); ]));
$dbForProject->createCollection('collection_' . $collectionId);
} catch (DuplicateException $th) { } catch (DuplicateException $th) {
throw new Exception('Collection already exists', 409); throw new Exception('Collection already exists', 409);
} catch (LimitException $th) {
throw new Exception('Collection limit exceeded', 400);
} }
$audits $audits

15
tests/e2e/Services/Database/DatabaseCustomServerTest.php
View file

@ -169,6 +169,21 @@ class DatabaseCustomServerTest extends Scope
]); ]);
$this->assertEquals($response['headers']['status-code'], 400); $this->assertEquals($response['headers']['status-code'], 400);
// This collection already exists
$response = $this->client->call(Client::METHOD_POST, '/database/collections', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]), [
'name' => 'Test 1',
'collectionId' => 'first',
'read' => ['role:all'],
'write' => ['role:all'],
'permission' => 'document'
]);
$this->assertEquals($response['headers']['status-code'], 409);
} }
public function testDeleteAttribute(): array public function testDeleteAttribute(): array