From adbe11fd50974292653eec46e1019260912ba20e Mon Sep 17 00:00:00 2001 From: fogelito Date: Mon, 12 Feb 2024 11:55:45 +0200 Subject: [PATCH] fix Indexes --- app/controllers/api/account.php | 4 +- app/controllers/api/databases.php | 37 +++++++++------ app/controllers/api/functions.php | 12 +++-- app/controllers/api/messaging.php | 40 ++++++++++++----- app/controllers/api/migrations.php | 4 +- app/controllers/api/projects.php | 4 +- app/controllers/api/proxy.php | 8 +++- app/controllers/api/storage.php | 8 +++- app/controllers/api/teams.php | 8 +++- app/controllers/api/users.php | 18 +++++--- app/controllers/api/vcs.php | 8 +++- composer.lock | 45 ++++++++----------- .../e2e/Services/Databases/DatabasesBase.php | 1 + 13 files changed, 127 insertions(+), 70 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 49eabcbf5c..595a4104c5 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -911,7 +911,9 @@ App::get('/v1/account/identities') $queries[] = Query::equal('userInternalId', [$user->getInternalId()]); - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index c913fcca5d..0eacdab3b8 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -493,7 +493,9 @@ App::get('/v1/databases') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -815,7 +817,9 @@ App::get('/v1/databases/:databaseId/collections') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -1649,7 +1653,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes') ->inject('response') ->inject('dbForProject') ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject) { - + /** @var Document $database */ $database = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId)); if ($database->isEmpty()) { @@ -1666,22 +1670,23 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes') \array_push( $queries, - Query::equal('collectionId', [$collectionId]), - Query::equal('databaseId', [$databaseId]) + Query::equal('collectionInternalId', [$collection->getInternalId()]), + Query::equal('databaseInternalId', [$database->getInternalId()]) ); - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); - $cursor = \reset($cursor); if ($cursor) { $attributeId = $cursor->getValue(); $cursorDocument = Authorization::skip(fn() => $dbForProject->find('attributes', [ - Query::equal('collectionId', [$collectionId]), - Query::equal('databaseId', [$databaseId]), + Query::equal('collectionInternalId', [$collection->getInternalId()]), + Query::equal('databaseInternalId', [$database->getInternalId()]), Query::equal('key', [$attributeId]), Query::limit(1), ])); @@ -2491,7 +2496,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes') ->inject('response') ->inject('dbForProject') ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject) { - + /** @var Document $database */ $database = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId)); if ($database->isEmpty()) { @@ -2507,7 +2512,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes') $queries = Query::parseQueries($queries); \array_push($queries, Query::equal('collectionId', [$collectionId]), Query::equal('databaseId', [$databaseId])); - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -2516,8 +2523,8 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes') if ($cursor) { $indexId = $cursor->getValue(); $cursorDocument = Authorization::skip(fn() => $dbForProject->find('indexes', [ - Query::equal('collectionId', [$collectionId]), - Query::equal('databaseId', [$databaseId]), + Query::equal('collectionInternalId', [$collection->getInternalId()]), + Query::equal('databaseInternalId', [$database->getInternalId()]), Query::equal('key', [$indexId]), Query::limit(1) ])); @@ -2914,7 +2921,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents') $queries = Query::parseQueries($queries); - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index 9c1f3cfa98..5b753fa86c 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -372,7 +372,9 @@ App::get('/v1/functions') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -1266,7 +1268,9 @@ App::get('/v1/functions/:functionId/deployments') $queries[] = Query::equal('resourceId', [$function->getId()]); $queries[] = Query::equal('resourceType', ['functions']); - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -1803,7 +1807,9 @@ App::get('/v1/functions/:functionId/executions') // Set internal queries $queries[] = Query::equal('functionId', [$function->getId()]); - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php index 25260e1071..d787dd5766 100644 --- a/app/controllers/api/messaging.php +++ b/app/controllers/api/messaging.php @@ -843,8 +843,12 @@ App::get('/v1/messaging/providers') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); $cursor = reset($cursor); if ($cursor) { @@ -1950,8 +1954,12 @@ App::get('/v1/messaging/topics') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); $cursor = reset($cursor); if ($cursor) { @@ -2272,8 +2280,12 @@ App::get('/v1/messaging/topics/:topicId/subscribers') \array_push($queries, Query::equal('topicInternalId', [$topic->getInternalId()])); - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); $cursor = reset($cursor); if ($cursor) { @@ -2851,8 +2863,12 @@ App::get('/v1/messaging/messages') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); $cursor = reset($cursor); if ($cursor) { @@ -2994,8 +3010,12 @@ App::get('/v1/messaging/messages/:messageId/targets') $queries[] = Query::equal('$id', $targetIDs); - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); $cursor = reset($cursor); if ($cursor) { diff --git a/app/controllers/api/migrations.php b/app/controllers/api/migrations.php index 87d3c12c99..eac9432d42 100644 --- a/app/controllers/api/migrations.php +++ b/app/controllers/api/migrations.php @@ -390,7 +390,9 @@ App::get('/v1/migrations') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index 30f6b1f376..6b84c75d6b 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -247,7 +247,9 @@ App::get('/v1/projects') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/proxy.php b/app/controllers/api/proxy.php index 3081b3def3..47e1fc0f2e 100644 --- a/app/controllers/api/proxy.php +++ b/app/controllers/api/proxy.php @@ -163,8 +163,12 @@ App::get('/v1/proxy/rules') $queries[] = Query::equal('projectInternalId', [$project->getInternalId()]); - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index fc5d00dfd0..305888d4cf 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -167,7 +167,9 @@ App::get('/v1/storage/buckets') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -743,7 +745,9 @@ App::get('/v1/storage/buckets/:bucketId/files') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 685c230f4c..dc426abc6f 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -152,7 +152,9 @@ App::get('/v1/teams') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -708,7 +710,9 @@ App::get('/v1/teams/:teamId/memberships') // Set internal queries $queries[] = Query::equal('teamId', [$teamId]); - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 375efe77cb..b74fda251e 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -542,7 +542,9 @@ App::get('/v1/users') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); @@ -838,9 +840,13 @@ App::get('/v1/users/:userId/targets') $queries[] = Query::equal('userId', [$userId]); - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); - $cursor = reset($cursor); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); + $cursor = reset($cursor); if ($cursor) { $targetId = $cursor->getValue(); @@ -882,7 +888,9 @@ App::get('/v1/users/identities') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ $cursor = \array_filter($queries, function ($query) { return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); }); diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index df18320cf2..096f57656d 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -977,8 +977,12 @@ App::get('/v1/vcs/installations') $queries[] = Query::search('search', $search); } - // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + /** + * Get cursor document if there was a cursor query, we user array_filter and reset for reference $cursor to $queries + */ + $cursor = \array_filter($queries, function ($query) { + return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]); + }); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ diff --git a/composer.lock b/composer.lock index 226d55e38f..1429dfe408 100644 --- a/composer.lock +++ b/composer.lock @@ -1029,16 +1029,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -1046,9 +1046,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1092,7 +1089,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -1108,7 +1105,7 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "thecodingmachine/safe", @@ -5123,16 +5120,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -5146,9 +5143,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -5185,7 +5179,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -5201,20 +5195,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -5228,9 +5222,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -5268,7 +5259,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -5284,7 +5275,7 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "textalk/websocket", diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php index 7580d73711..90ea4d8fa7 100644 --- a/tests/e2e/Services/Databases/DatabasesBase.php +++ b/tests/e2e/Services/Databases/DatabasesBase.php @@ -492,6 +492,7 @@ trait DatabasesBase Query::cursorAfter(new Document(['$id' => 'title']))->toString() ], ]); + var_dump($response); $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals(2, \count($response['body']['attributes'])); $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/attributes', array_merge([