From 2b3dc48bf11dfb68e8dc78ec91fbd78fc7d4049e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Tue, 30 Aug 2022 08:21:34 +0000 Subject: [PATCH] PR review changes --- app/controllers/api/databases.php | 18 ++---------------- app/controllers/api/functions.php | 9 --------- app/controllers/api/storage.php | 6 ------ app/controllers/api/teams.php | 6 ------ app/controllers/api/users.php | 3 --- composer.lock | 8 ++++---- .../Database/Validator/Queries/Buckets.php | 2 -- .../Database/Validator/Queries/Collections.php | 2 -- .../Database/Validator/Queries/Databases.php | 2 -- .../Database/Validator/Queries/Deployments.php | 2 -- .../Database/Validator/Queries/Executions.php | 2 -- .../Database/Validator/Queries/Files.php | 2 -- .../Database/Validator/Queries/Functions.php | 2 -- .../Database/Validator/Queries/Memberships.php | 2 -- .../Database/Validator/Queries/Teams.php | 2 -- .../Database/Validator/Queries/Users.php | 2 -- 16 files changed, 6 insertions(+), 64 deletions(-) diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index 6360a8936..76fcd9c0a 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -36,17 +36,12 @@ use Appwrite\Network\Validator\Email; use Appwrite\Network\Validator\IP; use Appwrite\Network\Validator\URL; use Appwrite\Utopia\Database\Validator\CustomId; -use Appwrite\Utopia\Database\Validator\IndexedQueries; -use Appwrite\Utopia\Database\Validator\Query\Cursor as Cursor; -use Appwrite\Utopia\Database\Validator\Query\Filter as Filter; -use Appwrite\Utopia\Database\Validator\Query\Limit as Limit; -use Appwrite\Utopia\Database\Validator\Query\Offset as Offset; -use Appwrite\Utopia\Database\Validator\Query\Order as Order; +use Appwrite\Utopia\Database\Validator\Query\Limit; +use Appwrite\Utopia\Database\Validator\Query\Offset; use Appwrite\Utopia\Response; use Appwrite\Detector\Detector; use Appwrite\Event\Database as EventDatabase; use Appwrite\Event\Event; -use Appwrite\Stats\Stats; use Appwrite\Utopia\Database\Validator\Queries; use Appwrite\Utopia\Database\Validator\Queries\Collections; use Appwrite\Utopia\Database\Validator\Queries\Databases; @@ -250,9 +245,6 @@ App::get('/v1/databases') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { @@ -573,9 +565,6 @@ App::get('/v1/databases/:databaseId/collections') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { @@ -1987,9 +1976,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents') $queries = Query::parseQueries($queries); - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index ddcfdb7ed..313e20967 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -117,9 +117,6 @@ App::get('/v1/functions') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { @@ -790,9 +787,6 @@ App::get('/v1/functions/:functionId/deployments') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Set resource queries $queries[] = Query::equal('resourceId', [$function->getId()]); $queries[] = Query::equal('resourceType', ['functions']); @@ -1147,9 +1141,6 @@ App::get('/v1/functions/:functionId/executions') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Set internal queries $queries[] = Query::equal('functionId', [$function->getId()]); diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 5ab2e8450..11fcb950f 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -164,9 +164,6 @@ App::get('/v1/storage/buckets') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { @@ -678,9 +675,6 @@ App::get('/v1/storage/buckets/:bucketId/files') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index d5f7b88ca..1811707aa 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -139,9 +139,6 @@ App::get('/v1/teams') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { @@ -484,9 +481,6 @@ App::get('/v1/teams/:teamId/memberships') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Set internal queries $queries[] = Query::equal('teamId', [$teamId]); diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index a6d4c57f7..43373f954 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -355,9 +355,6 @@ App::get('/v1/users') $queries[] = Query::search('search', $search); } - // Set default limit - $queries[] = Query::limit(25); - // Get cursor document if there was a cursor query $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null; if ($cursor !== null) { diff --git a/composer.lock b/composer.lock index d2f881d7c..ebecc59af 100644 --- a/composer.lock +++ b/composer.lock @@ -2841,12 +2841,12 @@ "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "bf05fc00755b9d27dac530669ca834f3ceb655ec" + "reference": "6e630a62f522ac68a7056bebf81cd032c7a053ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/bf05fc00755b9d27dac530669ca834f3ceb655ec", - "reference": "bf05fc00755b9d27dac530669ca834f3ceb655ec", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/6e630a62f522ac68a7056bebf81cd032c7a053ba", + "reference": "6e630a62f522ac68a7056bebf81cd032c7a053ba", "shasum": "" }, "require": { @@ -2884,7 +2884,7 @@ "issues": "https://github.com/appwrite/sdk-generator/issues", "source": "https://github.com/appwrite/sdk-generator/tree/master" }, - "time": "2022-08-28T04:14:32+00:00" + "time": "2022-08-29T10:43:33+00:00" }, { "name": "doctrine/instantiator", diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php index b52c0456a..c4d187520 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Buckets extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php index 579e80cea..6e8fcb833 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Collections extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php index 3278b140b..22f7ad9b8 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Databases extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php index a8323a831..05b3326af 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Deployments extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php index ae26b2633..74996936b 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Executions extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php index 8c2cf653b..1941eabcd 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Files extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php index 6ecf76d7a..ee4c31116 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Functions extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php b/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php index 2d90eeb0e..5ff009866 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Memberships extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php index e51c56519..67aba7159 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Teams extends Base { public const ALLOWED_ATTRIBUTES = [ diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php index a19cbfc41..9b0dfe61e 100644 --- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php +++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php @@ -2,8 +2,6 @@ namespace Appwrite\Utopia\Database\Validator\Queries; -use Appwrite\Utopia\Database\Validator\Queries\Base; - class Users extends Base { public const ALLOWED_ATTRIBUTES = [