From f15f8e7bf03892e74d130c267c629973333334ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 25 Aug 2022 09:34:36 +0000 Subject: [PATCH 1/3] Linter fix --- app/controllers/api/users.php | 6 ++++-- composer.lock | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index c99d3b41d0..6d7529ce7e 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -738,7 +738,8 @@ App::patch('/v1/users/:userId/name') $user ->setAttribute('name', $name) - ->setAttribute('search', \implode(' ', [$user->getId(), $user->getAttribute('email', ''), $name, $user->getAttribute('phone', '')]));; + ->setAttribute('search', \implode(' ', [$user->getId(), $user->getAttribute('email', ''), $name, $user->getAttribute('phone', '')])); + ; $user = $dbForProject->updateDocument('users', $user->getId(), $user); @@ -864,7 +865,8 @@ App::patch('/v1/users/:userId/phone') $user ->setAttribute('phone', $number) ->setAttribute('phoneVerification', false) - ->setAttribute('search', implode(' ', [$user->getId(), $user->getAttribute('name', ''), $user->getAttribute('email', ''), $number]));; + ->setAttribute('search', implode(' ', [$user->getId(), $user->getAttribute('name', ''), $user->getAttribute('email', ''), $number])); + ; try { $user = $dbForProject->updateDocument('users', $user->getId(), $user); diff --git a/composer.lock b/composer.lock index 0da13d2de3..39ac8e206c 100644 --- a/composer.lock +++ b/composer.lock @@ -2056,12 +2056,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "44dda6914c7be148eb59ce11847386ce39f7b106" + "reference": "336df0d08d8bd875acd6b2b87d7b24133aa016f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/44dda6914c7be148eb59ce11847386ce39f7b106", - "reference": "44dda6914c7be148eb59ce11847386ce39f7b106", + "url": "https://api.github.com/repos/utopia-php/database/zipball/336df0d08d8bd875acd6b2b87d7b24133aa016f5", + "reference": "336df0d08d8bd875acd6b2b87d7b24133aa016f5", "shasum": "" }, "require": { @@ -2112,7 +2112,7 @@ "issues": "https://github.com/utopia-php/database/issues", "source": "https://github.com/utopia-php/database/tree/refactor-permissions" }, - "time": "2022-08-24T10:22:04+00:00" + "time": "2022-08-25T08:19:47+00:00" }, { "name": "utopia-php/domains", @@ -5390,5 +5390,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From 035e72edf7467a223a3b09cd8ce0ef5d07994b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 25 Aug 2022 09:34:59 +0000 Subject: [PATCH 2/3] Lockfile update --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 0da13d2de3..39ac8e206c 100644 --- a/composer.lock +++ b/composer.lock @@ -2056,12 +2056,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "44dda6914c7be148eb59ce11847386ce39f7b106" + "reference": "336df0d08d8bd875acd6b2b87d7b24133aa016f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/44dda6914c7be148eb59ce11847386ce39f7b106", - "reference": "44dda6914c7be148eb59ce11847386ce39f7b106", + "url": "https://api.github.com/repos/utopia-php/database/zipball/336df0d08d8bd875acd6b2b87d7b24133aa016f5", + "reference": "336df0d08d8bd875acd6b2b87d7b24133aa016f5", "shasum": "" }, "require": { @@ -2112,7 +2112,7 @@ "issues": "https://github.com/utopia-php/database/issues", "source": "https://github.com/utopia-php/database/tree/refactor-permissions" }, - "time": "2022-08-24T10:22:04+00:00" + "time": "2022-08-25T08:19:47+00:00" }, { "name": "utopia-php/domains", @@ -5390,5 +5390,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From c85363f355780c5309c2bcc81bca1ca42f53f7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 25 Aug 2022 09:59:28 +0000 Subject: [PATCH 3/3] Fix bugs after merge --- app/controllers/api/account.php | 3 +-- app/controllers/api/databases.php | 19 +++++-------------- app/controllers/api/storage.php | 7 ++----- app/controllers/api/users.php | 8 ++------ .../Databases/DatabasesCustomServerTest.php | 4 ++-- 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 1d93d8de55..e9f280eaef 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -1354,8 +1354,7 @@ App::get('/v1/account/logs') ->inject('locale') ->inject('geodb') ->inject('dbForProject') - ->inject('usage') - ->action(function (array $queries, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject, Stats $usage) { + ->action(function (array $queries, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject) { $queries = Query::parseQueries($queries); $grouped = Query::groupByType($queries); diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index 884807fcfc..8ed75d88c0 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -242,8 +242,7 @@ App::get('/v1/databases') ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true) ->inject('response') ->inject('dbForProject') - ->inject('usage') - ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) { + ->action(function (array $queries, string $search, Response $response, Database $dbForProject) { $queries = Query::parseQueries($queries); @@ -270,8 +269,6 @@ App::get('/v1/databases') $filterQueries = Query::groupByType($queries)['filters']; - $usage->setParam('databases.read', 1); - $response->dynamic(new Document([ 'databases' => $dbForProject->find('databases', $queries), 'total' => $dbForProject->count('databases', $filterQueries, APP_LIMIT_COUNT), @@ -562,8 +559,7 @@ App::get('/v1/databases/:databaseId/collections') ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true) ->inject('response') ->inject('dbForProject') - ->inject('usage') - ->action(function (string $databaseId, array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) { + ->action(function (string $databaseId, array $queries, string $search, Response $response, Database $dbForProject) { $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId)); @@ -596,10 +592,6 @@ App::get('/v1/databases/:databaseId/collections') $filterQueries = Query::groupByType($queries)['filters']; - $usage - ->setParam('databaseId', $databaseId) - ->setParam('databases.collections.read', 1); - $response->dynamic(new Document([ 'collections' => $dbForProject->find('database_' . $database->getInternalId(), $queries), 'total' => $dbForProject->count('database_' . $database->getInternalId(), $filterQueries, APP_LIMIT_COUNT), @@ -1302,9 +1294,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti ->inject('response') ->inject('dbForProject') ->inject('database') - ->inject('usage') ->inject('events') - ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Stats $usage, Event $events) { + ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) { $attribute = createAttribute($databaseId, $collectionId, new Document([ 'key' => $key, @@ -1314,7 +1305,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti 'default' => $default, 'array' => $array, 'filters' => ['datetime'] - ]), $response, $dbForProject, $database, $events, $usage); + ]), $response, $dbForProject, $database, $events); $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_DATETIME); @@ -1962,7 +1953,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents') ->inject('response') ->inject('dbForProject') ->inject('mode') - ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, Stats $usage, string $mode) { + ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, string $mode) { $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId)); diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 2ff83bf269..2a77e9aef7 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -155,8 +155,7 @@ App::get('/v1/storage/buckets') ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true) ->inject('response') ->inject('dbForProject') - ->inject('usage') - ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) { + ->action(function (array $queries, string $search, Response $response, Database $dbForProject) { $queries = Query::parseQueries($queries); @@ -183,8 +182,6 @@ App::get('/v1/storage/buckets') $filterQueries = Query::groupByType($queries)['filters']; - $usage->setParam('storage.buckets.read', 1); - $response->dynamic(new Document([ 'buckets' => $dbForProject->find('buckets', $queries), 'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT), @@ -655,7 +652,7 @@ App::get('/v1/storage/buckets/:bucketId/files') ->inject('response') ->inject('dbForProject') ->inject('mode') - ->action(function (string $bucketId, array $queries, string $search, Response $response, Database $dbForProject, Stats $usage, string $mode) { + ->action(function (string $bucketId, array $queries, string $search, Response $response, Database $dbForProject, string $mode) { $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId)); diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 6d7529ce7e..54ca96cb13 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -347,8 +347,7 @@ App::get('/v1/users') ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true) ->inject('response') ->inject('dbForProject') - ->inject('usage') - ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) { + ->action(function (array $queries, string $search, Response $response, Database $dbForProject) { $queries = Query::parseQueries($queries); @@ -375,8 +374,6 @@ App::get('/v1/users') $filterQueries = Query::groupByType($queries)['filters']; - $usage->setParam('users.read', 1); - $response->dynamic(new Document([ 'users' => $dbForProject->find('users', $queries), 'total' => $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT), @@ -537,8 +534,7 @@ App::get('/v1/users/:userId/logs') ->inject('dbForProject') ->inject('locale') ->inject('geodb') - ->inject('usage') - ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Stats $usage) { + ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) { $user = $dbForProject->getDocument('users', $userId); diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php index 2b204da304..bd4e8aa77b 100644 --- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php +++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php @@ -104,7 +104,7 @@ class DatabasesCustomServerTest extends Scope 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'queries' => [ 'orderDesc("$id")' ], + 'queries' => [ 'orderDesc("")' ], ]); $this->assertEquals(2, $databases['body']['total']); @@ -380,7 +380,7 @@ class DatabasesCustomServerTest extends Scope 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'queries' => [ 'orderDesc("$id")' ], + 'queries' => [ 'orderDesc("")' ], ]); $this->assertEquals(2, $collections['body']['total']);