diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index 2180927fa..d03c52a15 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -915,6 +915,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string 'array' => $array, ]), $response, $dbForProject, $database, $audits, $events, $usage); + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_STRING); }); @@ -955,6 +956,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email' 'format' => APP_DATABASE_ATTRIBUTE_EMAIL, ]), $response, $dbForProject, $database, $audits, $events, $usage); + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_EMAIL); }); @@ -1011,6 +1013,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum') 'formatOptions' => ['elements' => $elements], ]), $response, $dbForProject, $database, $audits, $events, $usage); + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_ENUM); }); @@ -1051,6 +1054,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip') 'format' => APP_DATABASE_ATTRIBUTE_IP, ]), $response, $dbForProject, $database, $audits, $events, $usage); + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_IP); }); @@ -1091,6 +1095,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url') 'format' => APP_DATABASE_ATTRIBUTE_URL, ]), $response, $dbForProject, $database, $audits, $events, $usage); + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_URL); }); @@ -1160,6 +1165,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege $attribute->setAttribute('max', \intval($formatOptions['max'])); } + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_INTEGER); }); @@ -1232,6 +1238,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float' $attribute->setAttribute('max', \floatval($formatOptions['max'])); } + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_FLOAT); }); @@ -1271,6 +1278,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea 'array' => $array, ]), $response, $dbForProject, $database, $audits, $events, $usage); + $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_BOOLEAN); }); diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php index 34a4160fd..c86f7d62e 100644 --- a/tests/e2e/Services/Databases/DatabasesBase.php +++ b/tests/e2e/Services/Databases/DatabasesBase.php @@ -165,23 +165,23 @@ trait DatabasesBase 'array' => true, ]); - $this->assertEquals($title['headers']['status-code'], 201); + $this->assertEquals($title['headers']['status-code'], 202); $this->assertEquals($title['body']['key'], 'title'); $this->assertEquals($title['body']['type'], 'string'); $this->assertEquals($title['body']['size'], 256); $this->assertEquals($title['body']['required'], true); - $this->assertEquals($releaseYear['headers']['status-code'], 201); + $this->assertEquals($releaseYear['headers']['status-code'], 202); $this->assertEquals($releaseYear['body']['key'], 'releaseYear'); $this->assertEquals($releaseYear['body']['type'], 'integer'); $this->assertEquals($releaseYear['body']['required'], true); - $this->assertEquals($duration['headers']['status-code'], 201); + $this->assertEquals($duration['headers']['status-code'], 202); $this->assertEquals($duration['body']['key'], 'duration'); $this->assertEquals($duration['body']['type'], 'integer'); $this->assertEquals($duration['body']['required'], false); - $this->assertEquals($actors['headers']['status-code'], 201); + $this->assertEquals($actors['headers']['status-code'], 202); $this->assertEquals($actors['body']['key'], 'actors'); $this->assertEquals($actors['body']['type'], 'string'); $this->assertEquals($actors['body']['size'], 256); @@ -318,7 +318,7 @@ trait DatabasesBase 'default' => true, ]); - $this->assertEquals(201, $string['headers']['status-code']); + $this->assertEquals(202, $string['headers']['status-code']); $this->assertEquals('string', $string['body']['key']); $this->assertEquals('string', $string['body']['type']); $this->assertEquals(false, $string['body']['required']); @@ -326,7 +326,7 @@ trait DatabasesBase $this->assertEquals(16, $string['body']['size']); $this->assertEquals('default', $string['body']['default']); - $this->assertEquals(201, $email['headers']['status-code']); + $this->assertEquals(202, $email['headers']['status-code']); $this->assertEquals('email', $email['body']['key']); $this->assertEquals('string', $email['body']['type']); $this->assertEquals(false, $email['body']['required']); @@ -334,7 +334,7 @@ trait DatabasesBase $this->assertEquals('email', $email['body']['format']); $this->assertEquals('default@example.com', $email['body']['default']); - $this->assertEquals(201, $enum['headers']['status-code']); + $this->assertEquals(202, $enum['headers']['status-code']); $this->assertEquals('enum', $enum['body']['key']); $this->assertEquals('string', $enum['body']['type']); $this->assertEquals(false, $enum['body']['required']); @@ -344,7 +344,7 @@ trait DatabasesBase $this->assertIsArray($enum['body']['elements']); $this->assertEquals(['yes', 'no', 'maybe'], $enum['body']['elements']); - $this->assertEquals(201, $ip['headers']['status-code']); + $this->assertEquals(202, $ip['headers']['status-code']); $this->assertEquals('ip', $ip['body']['key']); $this->assertEquals('string', $ip['body']['type']); $this->assertEquals(false, $ip['body']['required']); @@ -352,7 +352,7 @@ trait DatabasesBase $this->assertEquals('ip', $ip['body']['format']); $this->assertEquals('192.0.2.0', $ip['body']['default']); - $this->assertEquals(201, $url['headers']['status-code']); + $this->assertEquals(202, $url['headers']['status-code']); $this->assertEquals('url', $url['body']['key']); $this->assertEquals('string', $url['body']['type']); $this->assertEquals(false, $url['body']['required']); @@ -360,7 +360,7 @@ trait DatabasesBase $this->assertEquals('url', $url['body']['format']); $this->assertEquals('http://example.com', $url['body']['default']); - $this->assertEquals(201, $integer['headers']['status-code']); + $this->assertEquals(202, $integer['headers']['status-code']); $this->assertEquals('integer', $integer['body']['key']); $this->assertEquals('integer', $integer['body']['type']); $this->assertEquals(false, $integer['body']['required']); @@ -369,7 +369,7 @@ trait DatabasesBase $this->assertEquals(5, $integer['body']['max']); $this->assertEquals(3, $integer['body']['default']); - $this->assertEquals(201, $float['headers']['status-code']); + $this->assertEquals(202, $float['headers']['status-code']); $this->assertEquals('float', $float['body']['key']); $this->assertEquals('double', $float['body']['type']); $this->assertEquals(false, $float['body']['required']); @@ -378,7 +378,7 @@ trait DatabasesBase $this->assertEquals(5.5, $float['body']['max']); $this->assertEquals(3.5, $float['body']['default']); - $this->assertEquals(201, $boolean['headers']['status-code']); + $this->assertEquals(202, $boolean['headers']['status-code']); $this->assertEquals('boolean', $boolean['body']['key']); $this->assertEquals('boolean', $boolean['body']['type']); $this->assertEquals(false, $boolean['body']['required']); @@ -705,7 +705,7 @@ trait DatabasesBase 'attributes' => ['title'], ]); - $this->assertEquals(201, $titleIndex['headers']['status-code']); + $this->assertEquals(202, $titleIndex['headers']['status-code']); $this->assertEquals('titleIndex', $titleIndex['body']['key']); $this->assertEquals('fulltext', $titleIndex['body']['type']); $this->assertCount(1, $titleIndex['body']['attributes']); @@ -721,7 +721,7 @@ trait DatabasesBase 'attributes' => ['releaseYear'], ]); - $this->assertEquals(201, $releaseYearIndex['headers']['status-code']); + $this->assertEquals(202, $releaseYearIndex['headers']['status-code']); $this->assertEquals('releaseYear', $releaseYearIndex['body']['key']); $this->assertEquals('key', $releaseYearIndex['body']['type']); $this->assertCount(1, $releaseYearIndex['body']['attributes']); @@ -737,7 +737,7 @@ trait DatabasesBase 'attributes' => ['releaseYear', '$createdAt', '$updatedAt'], ]); - $this->assertEquals(201, $releaseWithDate['headers']['status-code']); + $this->assertEquals(202, $releaseWithDate['headers']['status-code']); $this->assertEquals('releaseYearDated', $releaseWithDate['body']['key']); $this->assertEquals('key', $releaseWithDate['body']['type']); $this->assertCount(3, $releaseWithDate['body']['attributes']); @@ -1689,15 +1689,15 @@ trait DatabasesBase 'default' => 'NORTH' ]); - $this->assertEquals(201, $email['headers']['status-code']); - $this->assertEquals(201, $ip['headers']['status-code']); - $this->assertEquals(201, $url['headers']['status-code']); - $this->assertEquals(201, $range['headers']['status-code']); - $this->assertEquals(201, $floatRange['headers']['status-code']); - $this->assertEquals(201, $probability['headers']['status-code']); - $this->assertEquals(201, $upperBound['headers']['status-code']); - $this->assertEquals(201, $lowerBound['headers']['status-code']); - $this->assertEquals(201, $enum['headers']['status-code']); + $this->assertEquals(202, $email['headers']['status-code']); + $this->assertEquals(202, $ip['headers']['status-code']); + $this->assertEquals(202, $url['headers']['status-code']); + $this->assertEquals(202, $range['headers']['status-code']); + $this->assertEquals(202, $floatRange['headers']['status-code']); + $this->assertEquals(202, $probability['headers']['status-code']); + $this->assertEquals(202, $upperBound['headers']['status-code']); + $this->assertEquals(202, $lowerBound['headers']['status-code']); + $this->assertEquals(202, $enum['headers']['status-code']); $this->assertEquals(400, $invalidRange['headers']['status-code']); $this->assertEquals(400, $defaultArray['headers']['status-code']); $this->assertEquals(400, $defaultRequired['headers']['status-code']); @@ -2144,7 +2144,7 @@ trait DatabasesBase 'required' => true, ]); - $this->assertEquals(201, $attribute['headers']['status-code'], 201); + $this->assertEquals(202, $attribute['headers']['status-code'], 202); $this->assertEquals('attribute', $attribute['body']['key']); // wait for db to add attribute @@ -2160,7 +2160,7 @@ trait DatabasesBase 'attributes' => [$attribute['body']['key']], ]); - $this->assertEquals(201, $index['headers']['status-code']); + $this->assertEquals(202, $index['headers']['status-code']); $this->assertEquals('key_attribute', $index['body']['key']); // wait for db to add attribute @@ -2292,7 +2292,7 @@ trait DatabasesBase 'attributes' => ['title'], ]); - $this->assertEquals($uniqueIndex['headers']['status-code'], 201); + $this->assertEquals($uniqueIndex['headers']['status-code'], 202); sleep(2); @@ -2464,7 +2464,7 @@ trait DatabasesBase 'required' => true, ]); - $this->assertEquals($title['headers']['status-code'], 201); + $this->assertEquals($title['headers']['status-code'], 202); // wait for database worker to create attributes sleep(2); diff --git a/tests/e2e/Services/Databases/DatabasesCustomClientTest.php b/tests/e2e/Services/Databases/DatabasesCustomClientTest.php index 93316cb39..f37c21cbf 100644 --- a/tests/e2e/Services/Databases/DatabasesCustomClientTest.php +++ b/tests/e2e/Services/Databases/DatabasesCustomClientTest.php @@ -63,7 +63,7 @@ class DatabasesCustomClientTest extends Scope 'size' => 255, 'required' => true, ]); - $this->assertEquals(201, $response['headers']['status-code']); + $this->assertEquals(202, $response['headers']['status-code']); // Wait for database worker to finish creating attributes sleep(2); diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php index cc75a13a8..9f4c649fd 100644 --- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php +++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php @@ -618,8 +618,8 @@ class DatabasesCustomServerTest extends Scope 'required' => true, ]); - $this->assertEquals(201, $attribute1['headers']['status-code']); - $this->assertEquals(201, $attribute2['headers']['status-code']); + $this->assertEquals(202, $attribute1['headers']['status-code']); + $this->assertEquals(202, $attribute2['headers']['status-code']); $this->assertEquals('attribute1', $attribute1['body']['key']); $this->assertEquals('attribute2', $attribute2['body']['key']); @@ -646,8 +646,8 @@ class DatabasesCustomServerTest extends Scope 'attributes' => ['attribute2'], ]); - $this->assertEquals(201, $index1['headers']['status-code']); - $this->assertEquals(201, $index2['headers']['status-code']); + $this->assertEquals(202, $index1['headers']['status-code']); + $this->assertEquals(202, $index2['headers']['status-code']); $this->assertEquals('index1', $index1['body']['key']); $this->assertEquals('index2', $index2['body']['key']); @@ -742,8 +742,8 @@ class DatabasesCustomServerTest extends Scope 'required' => true, ]); - $this->assertEquals(201, $attribute1['headers']['status-code']); - $this->assertEquals(201, $attribute2['headers']['status-code']); + $this->assertEquals(202, $attribute1['headers']['status-code']); + $this->assertEquals(202, $attribute2['headers']['status-code']); $this->assertEquals('attribute1', $attribute1['body']['key']); $this->assertEquals('attribute2', $attribute2['body']['key']); @@ -770,8 +770,8 @@ class DatabasesCustomServerTest extends Scope 'attributes' => ['attribute2'], ]); - $this->assertEquals(201, $index1['headers']['status-code']); - $this->assertEquals(201, $index2['headers']['status-code']); + $this->assertEquals(202, $index1['headers']['status-code']); + $this->assertEquals(202, $index2['headers']['status-code']); $this->assertEquals('index1', $index1['body']['key']); $this->assertEquals('index2', $index2['body']['key']); @@ -980,7 +980,7 @@ class DatabasesCustomServerTest extends Scope 'required' => true, ]); - $this->assertEquals($attribute['headers']['status-code'], 201); + $this->assertEquals($attribute['headers']['status-code'], 202); } sleep(5); @@ -1043,7 +1043,7 @@ class DatabasesCustomServerTest extends Scope 'required' => true, ]); - $this->assertEquals($attribute['headers']['status-code'], 201); + $this->assertEquals($attribute['headers']['status-code'], 202); } sleep(20); @@ -1080,7 +1080,7 @@ class DatabasesCustomServerTest extends Scope 'attributes' => ["attribute{$i}"], ]); - $this->assertEquals(201, $index['headers']['status-code']); + $this->assertEquals(202, $index['headers']['status-code']); $this->assertEquals("key_attribute{$i}", $index['body']['key']); } diff --git a/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php b/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php index 0c3f3a08a..c629ae3f6 100644 --- a/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php +++ b/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php @@ -77,7 +77,7 @@ class DatabasesPermissionsMemberTest extends Scope 'size' => 256, 'required' => true, ]); - $this->assertEquals(201, $response['headers']['status-code']); + $this->assertEquals(202, $response['headers']['status-code']); $private = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', $this->getServerHeader(), [ 'collectionId' => 'unique()', @@ -95,7 +95,7 @@ class DatabasesPermissionsMemberTest extends Scope 'size' => 256, 'required' => true, ]); - $this->assertEquals(201, $response['headers']['status-code']); + $this->assertEquals(202, $response['headers']['status-code']); sleep(2); diff --git a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php index 8217f4653..1112a230a 100644 --- a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php +++ b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php @@ -177,7 +177,7 @@ class RealtimeConsoleClientTest extends Scope $attributeKey = $name['body']['key']; - $this->assertEquals($name['headers']['status-code'], 201); + $this->assertEquals($name['headers']['status-code'], 202); $this->assertEquals($name['body']['key'], 'name'); $this->assertEquals($name['body']['type'], 'string'); $this->assertEquals($name['body']['size'], 256); diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php index d1091e535..5753f007f 100644 --- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php +++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php @@ -661,7 +661,7 @@ class RealtimeCustomClientTest extends Scope 'required' => true, ]); - $this->assertEquals($name['headers']['status-code'], 201); + $this->assertEquals($name['headers']['status-code'], 202); $this->assertEquals($name['body']['key'], 'name'); $this->assertEquals($name['body']['type'], 'string'); $this->assertEquals($name['body']['size'], 256); @@ -871,7 +871,7 @@ class RealtimeCustomClientTest extends Scope 'required' => true, ]); - $this->assertEquals($name['headers']['status-code'], 201); + $this->assertEquals($name['headers']['status-code'], 202); $this->assertEquals($name['body']['key'], 'name'); $this->assertEquals($name['body']['type'], 'string'); $this->assertEquals($name['body']['size'], 256); diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php index c1647b6e8..1a3f511ea 100644 --- a/tests/e2e/Services/Webhooks/WebhooksBase.php +++ b/tests/e2e/Services/Webhooks/WebhooksBase.php @@ -115,11 +115,11 @@ trait WebhooksBase $attributeId = $extra['body']['key']; - $this->assertEquals($firstName['headers']['status-code'], 201); + $this->assertEquals($firstName['headers']['status-code'], 202); $this->assertEquals($firstName['body']['key'], 'firstName'); - $this->assertEquals($lastName['headers']['status-code'], 201); + $this->assertEquals($lastName['headers']['status-code'], 202); $this->assertEquals($lastName['body']['key'], 'lastName'); - $this->assertEquals($extra['headers']['status-code'], 201); + $this->assertEquals($extra['headers']['status-code'], 202); $this->assertEquals($extra['body']['key'], 'extra'); // wait for database worker to kick in