From 5baa2ad113a5ef14f5cdee4b429de6cab72ec42f Mon Sep 17 00:00:00 2001 From: ArnabChatterjee20k Date: Tue, 5 Aug 2025 13:29:38 +0530 Subject: [PATCH] refactor: Rename triggerQueuesForBulkDocuments to triggerBulk for consistency across document actions --- .../Http/Databases/Collections/Documents/Action.php | 12 ++++++++++-- .../Databases/Collections/Documents/Bulk/Delete.php | 6 +++--- .../Databases/Collections/Documents/Bulk/Update.php | 6 +++--- .../Http/Databases/Collections/Documents/Create.php | 2 +- .../Databases/Http/Grids/Tables/Rows/Bulk/Delete.php | 2 +- .../Databases/Http/Grids/Tables/Rows/Bulk/Update.php | 2 +- tests/e2e/Scopes/Scope.php | 4 ++-- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php index 8b33e64ba8..7e9aafad75 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php @@ -293,8 +293,16 @@ abstract class Action extends UtopiaAction * @param Event $queueForWebhooks * @return void */ - final protected function triggerQueuesForBulkDocuments(string $event, Document $database, Document $collection, array $documents, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks) - { + protected function triggerBulk( + string $event, + Document $database, + Document $collection, + array $documents, + Event $queueForEvents, + Event $queueForRealtime, + Event $queueForFunctions, + Event $queueForWebhooks + ): void { $queueForEvents ->setEvent($event) ->setParam('databaseId', $database->getId()) diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php index 17c524b23c..f44e54f2b4 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php @@ -73,15 +73,15 @@ class Delete extends Action ->inject('response') ->inject('dbForProject') ->inject('queueForStatsUsage') - ->inject('plan') ->inject('queueForEvents') ->inject('queueForRealtime') ->inject('queueForFunctions') ->inject('queueForWebhooks') + ->inject('plan') ->callback($this->action(...)); } - public function action(string $databaseId, string $collectionId, array $queries, UtopiaResponse $response, Database $dbForProject, StatsUsage $queueForStatsUsage, array $plan, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks): void + public function action(string $databaseId, string $collectionId, array $queries, UtopiaResponse $response, Database $dbForProject, StatsUsage $queueForStatsUsage, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, array $plan): void { $database = $dbForProject->getDocument('databases', $databaseId); if ($database->isEmpty()) { @@ -140,7 +140,7 @@ class Delete extends Action $this->getSdkGroup() => $documents, ]), $this->getResponseModel()); - $this->triggerQueuesForBulkDocuments( + $this->triggerBulk( 'databases.[databaseId].collections.[collectionId].documents.[documentId].delete', $database, $collection, diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php index 908817f31d..82b39ef178 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php @@ -77,15 +77,15 @@ class Update extends Action ->inject('response') ->inject('dbForProject') ->inject('queueForStatsUsage') - ->inject('plan') ->inject('queueForEvents') ->inject('queueForRealtime') ->inject('queueForFunctions') ->inject('queueForWebhooks') + ->inject('plan') ->callback($this->action(...)); } - public function action(string $databaseId, string $collectionId, string|array $data, array $queries, UtopiaResponse $response, Database $dbForProject, StatsUsage $queueForStatsUsage, array $plan, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks): void + public function action(string $databaseId, string $collectionId, string|array $data, array $queries, UtopiaResponse $response, Database $dbForProject, StatsUsage $queueForStatsUsage, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, array $plan): void { $data = \is_string($data) ? \json_decode($data, true) @@ -164,7 +164,7 @@ class Update extends Action $this->getSdkGroup() => $documents ]), $this->getResponseModel()); - $this->triggerQueuesForBulkDocuments( + $this->triggerBulk( 'databases.[databaseId].collections.[collectionId].documents.[documentId].update', $database, $collection, diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php index d961f400eb..0691249943 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php @@ -419,7 +419,7 @@ class Create extends Action $this->getSdkGroup() => $documents ]), $this->getBulkResponseModel()); - $this->triggerQueuesForBulkDocuments( + $this->triggerBulk( 'databases.[databaseId].collections.[collectionId].documents.[documentId].create', $database, $collection, diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Delete.php index aab4906d02..9a594245b3 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Delete.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Delete.php @@ -59,11 +59,11 @@ class Delete extends DocumentsDelete ->inject('response') ->inject('dbForProject') ->inject('queueForStatsUsage') - ->inject('plan') ->inject('queueForEvents') ->inject('queueForRealtime') ->inject('queueForFunctions') ->inject('queueForWebhooks') + ->inject('plan') ->callback($this->action(...)); } } diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Update.php index 2c373ffbc6..d33e8b0fb6 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Update.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Update.php @@ -61,11 +61,11 @@ class Update extends DocumentsUpdate ->inject('response') ->inject('dbForProject') ->inject('queueForStatsUsage') - ->inject('plan') ->inject('queueForEvents') ->inject('queueForRealtime') ->inject('queueForFunctions') ->inject('queueForWebhooks') + ->inject('plan') ->callback($this->action(...)); } } diff --git a/tests/e2e/Scopes/Scope.php b/tests/e2e/Scopes/Scope.php index a9451cc22b..c072fdca35 100644 --- a/tests/e2e/Scopes/Scope.php +++ b/tests/e2e/Scopes/Scope.php @@ -182,9 +182,9 @@ abstract class Scope extends TestCase /** * @return array */ - public function getUser(bool $override = false): array + public function getUser(bool $fresh = false): array { - if (!$override && isset(self::$user[$this->getProject()['$id']])) { + if (!$fresh && isset(self::$user[$this->getProject()['$id']])) { return self::$user[$this->getProject()['$id']]; }