From 3ac2adf13fa31a63aea8b289b7b11792e3f0e1f4 Mon Sep 17 00:00:00 2001 From: fogelito Date: Tue, 31 Jan 2023 18:16:24 +0200 Subject: [PATCH] Update list with databaseId --- app/controllers/api/databases.php | 7 +++++-- tests/e2e/Services/Databases/DatabasesBase.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index cc014438dd..fcb0b9a995 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -2874,7 +2874,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/usage') }); -App::get('/v1/databases/slow-queries') +App::get('/v1/databases/:databaseId/slow-queries') ->desc('List timeouts Documents') ->groups(['api', 'database']) ->label('docs', false) @@ -2887,11 +2887,14 @@ App::get('/v1/databases/slow-queries') ->label('sdk.response.code', Response::STATUS_CODE_OK) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_DOCUMENT_LIST) + ->param('databaseId', '', new UID(), 'Database ID.') ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true) ->inject('response') ->inject('dbForProject') - ->action(function (array $queries, Response $response, Database $dbForProject) { + ->action(function ($databaseId, array $queries, Response $response, Database $dbForProject) { $queries = Query::parseQueries($queries); + $queries[] = Query::equal('databaseId', [$databaseId]); + $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); $cursor = reset($cursor); if ($cursor) { diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php index 2940dac535..1d195965f9 100644 --- a/tests/e2e/Services/Databases/DatabasesBase.php +++ b/tests/e2e/Services/Databases/DatabasesBase.php @@ -1037,7 +1037,7 @@ trait DatabasesBase */ public function testConsoleTimeouts(array $data): void { - $documents = $this->client->call(Client::METHOD_GET, '/databases/slow-queries', array_merge([ + $documents = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/slow-queries', array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [