From 6235a1c729627302bb991afdf419906abb848b99 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 20 Feb 2025 10:33:58 +0000
Subject: [PATCH 01/19] chore: make min/max params optional for attribute
 update

---
 app/controllers/api/databases.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index c563d1e8e0..a4b5683512 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -2339,14 +2339,19 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
     ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
     ->param('key', '', new Key(), 'Attribute Key.')
     ->param('required', null, new Boolean(), 'Is attribute required?')
-    ->param('min', null, new Integer(), 'Minimum value to enforce on new documents')
-    ->param('max', null, new Integer(), 'Maximum value to enforce on new documents')
+    ->param('min', null, new Integer(), 'Minimum value to enforce on new documents', true)
+    ->param('max', null, new Integer(), 'Maximum value to enforce on new documents', true)
     ->param('default', null, new Nullable(new Integer()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
     ->param('newKey', null, new Key(), 'New attribute key.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('queueForEvents')
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, ?string $newKey, Response $response, Database $dbForProject, Event $queueForEvents) {
+
+        // Ensure attribute default is within range
+        $min = \is_null($min) ? PHP_INT_MIN : $min;
+        $max = \is_null($max) ? PHP_INT_MAX : $max;
+
         $attribute = updateAttribute(
             databaseId: $databaseId,
             collectionId: $collectionId,
@@ -2398,14 +2403,19 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
     ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
     ->param('key', '', new Key(), 'Attribute Key.')
     ->param('required', null, new Boolean(), 'Is attribute required?')
-    ->param('min', null, new FloatValidator(), 'Minimum value to enforce on new documents')
-    ->param('max', null, new FloatValidator(), 'Maximum value to enforce on new documents')
+    ->param('min', null, new FloatValidator(), 'Minimum value to enforce on new documents', true)
+    ->param('max', null, new FloatValidator(), 'Maximum value to enforce on new documents', true)
     ->param('default', null, new Nullable(new FloatValidator()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
     ->param('newKey', null, new Key(), 'New attribute key.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('queueForEvents')
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, ?string $newKey, Response $response, Database $dbForProject, Event $queueForEvents) {
+
+        // Ensure attribute default is within range
+        $min = \is_null($min) ? -PHP_FLOAT_MAX : $min;
+        $max = \is_null($max) ? PHP_FLOAT_MAX : $max;
+
         $attribute = updateAttribute(
             databaseId: $databaseId,
             collectionId: $collectionId,

From ccb7dfa839311a78c624c516800ed1cc0d142a53 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 20 Feb 2025 11:15:05 +0000
Subject: [PATCH 02/19] chore: added test cases

---
 .../e2e/Services/Databases/DatabasesBase.php  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index 0f57f94515..6a4839274c 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -464,6 +464,38 @@ trait DatabasesBase
 
         $this->assertEquals(400, $attribute['headers']['status-code']);
         $this->assertStringContainsString('Index length is longer than the maximum: 76', $attribute['body']['message']);
+
+        $integer = $this->client->call(Client::METHOD_POST, '/databases/'.$databaseId.'/collections/'.$collection['body']['$id'].'/attributes/integer', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'key' => 'integer',
+            'required' => false,
+            'min' => 1,
+            'max' => 5,
+            'default' => 3
+        ]);
+        $this->assertEquals(202, $integer['headers']['status-code']);
+
+        sleep(1);
+
+        /**
+         * Update integer default value to 10
+         */
+        $integer = $this->client->call(Client::METHOD_PATCH, '/databases/'.$databaseId.'/collections/'.$collection['body']['$id'].'/attributes/integer/'.$integer['body']['key'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ]), [
+            'key' => 'integer',
+            'required' => false,
+            'default' => 10
+        ]);
+
+        $this->assertEquals(200, $integer['headers']['status-code']);
+        $this->assertEquals(PHP_INT_MIN, $integer['body']['min']);
+        $this->assertEquals(PHP_INT_MAX, $integer['body']['max']);
     }
 
     public function testUpdateAttributeEnum(): void

From b0ced9b351746a23c4fd976f6ff0e022e459a541 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 20 Feb 2025 13:37:13 +0000
Subject: [PATCH 03/19] chore: updated tests

---
 .../e2e/Services/Databases/DatabasesBase.php  |  32 ------
 .../Databases/DatabasesCustomServerTest.php   | 102 +++++++++---------
 2 files changed, 50 insertions(+), 84 deletions(-)

diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index 6a4839274c..0f57f94515 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -464,38 +464,6 @@ trait DatabasesBase
 
         $this->assertEquals(400, $attribute['headers']['status-code']);
         $this->assertStringContainsString('Index length is longer than the maximum: 76', $attribute['body']['message']);
-
-        $integer = $this->client->call(Client::METHOD_POST, '/databases/'.$databaseId.'/collections/'.$collection['body']['$id'].'/attributes/integer', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey']
-        ]), [
-            'key' => 'integer',
-            'required' => false,
-            'min' => 1,
-            'max' => 5,
-            'default' => 3
-        ]);
-        $this->assertEquals(202, $integer['headers']['status-code']);
-
-        sleep(1);
-
-        /**
-         * Update integer default value to 10
-         */
-        $integer = $this->client->call(Client::METHOD_PATCH, '/databases/'.$databaseId.'/collections/'.$collection['body']['$id'].'/attributes/integer/'.$integer['body']['key'], array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey'],
-        ]), [
-            'key' => 'integer',
-            'required' => false,
-            'default' => 10
-        ]);
-
-        $this->assertEquals(200, $integer['headers']['status-code']);
-        $this->assertEquals(PHP_INT_MIN, $integer['body']['min']);
-        $this->assertEquals(PHP_INT_MAX, $integer['body']['max']);
     }
 
     public function testUpdateAttributeEnum(): void
diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index b501e2119e..ac1df82c9d 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -2309,6 +2309,30 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(100, $new['body']['min']);
         $this->assertEquals(2000, $new['body']['max']);
 
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/integer/' . $key, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'required' => false,
+            'default' => 100,
+            'min' => 0,
+        ]);
+
+        $this->assertEquals(200, $update['headers']['status-code']);
+
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/integer/' . $key, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'required' => false,
+            'default' => 100,
+            'max' => 0,
+        ]);
+
+        $this->assertEquals(200, $update['headers']['status-code']);
+
         /**
          * Test against failure
          */
@@ -2368,32 +2392,6 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/integer/' . $key, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey']
-        ]), [
-            'required' => false,
-            'default' => 100,
-            'min' => 0,
-        ]);
-
-        $this->assertEquals(400, $update['headers']['status-code']);
-        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
-
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/integer/' . $key, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey']
-        ]), [
-            'required' => false,
-            'default' => 100,
-            'max' => 0,
-        ]);
-
-        $this->assertEquals(400, $update['headers']['status-code']);
-        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
-
         $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2572,6 +2570,32 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(123.456, $new['body']['min']);
         $this->assertEquals(2000, $new['body']['max']);
 
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/float/' . $key, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'required' => false,
+            'default' => 123.456,
+            'min' => 0.0,
+        ]);
+
+        $this->assertEquals(200, $update['headers']['status-code']);
+        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
+
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/float/' . $key, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'required' => false,
+            'default' => 123.456,
+            'max' => 0.0,
+        ]);
+
+        $this->assertEquals(200, $update['headers']['status-code']);
+        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
+
         /**
          * Test against failure
          */
@@ -2631,32 +2655,6 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/float/' . $key, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey']
-        ]), [
-            'required' => false,
-            'default' => 123.456,
-            'min' => 0.0,
-        ]);
-
-        $this->assertEquals(400, $update['headers']['status-code']);
-        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
-
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/float/' . $key, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey']
-        ]), [
-            'required' => false,
-            'default' => 123.456,
-            'max' => 0.0,
-        ]);
-
-        $this->assertEquals(400, $update['headers']['status-code']);
-        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
-
         $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],

From 077fe10d808a04c2a500c6d560633b5163375429 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 20 Feb 2025 14:12:14 +0000
Subject: [PATCH 04/19] chore: fix tests

---
 tests/e2e/Services/Databases/DatabasesCustomServerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index ac1df82c9d..213584c3df 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -2327,7 +2327,7 @@ class DatabasesCustomServerTest extends Scope
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
             'required' => false,
-            'default' => 100,
+            'default' => -10,
             'max' => 0,
         ]);
 
@@ -2589,7 +2589,7 @@ class DatabasesCustomServerTest extends Scope
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
             'required' => false,
-            'default' => 123.456,
+            'default' => -123.456,
             'max' => 0.0,
         ]);
 

From f9cc7882aa78e3ab6e66a202afdf0ebfcbbe3f5c Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 20 Feb 2025 14:43:21 +0000
Subject: [PATCH 05/19] chore: fix tests

---
 tests/e2e/Services/Databases/DatabasesCustomServerTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 213584c3df..ad581eecb6 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -2581,7 +2581,6 @@ class DatabasesCustomServerTest extends Scope
         ]);
 
         $this->assertEquals(200, $update['headers']['status-code']);
-        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
         $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/float/' . $key, array_merge([
             'content-type' => 'application/json',

From c660b9d858b9cb9b0e2ee85f8e5f64d30d555cb5 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 20 Feb 2025 14:56:23 +0000
Subject: [PATCH 06/19] chore: fix tests

---
 tests/e2e/Services/Databases/DatabasesCustomServerTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index ad581eecb6..75526b9928 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -2593,7 +2593,6 @@ class DatabasesCustomServerTest extends Scope
         ]);
 
         $this->assertEquals(200, $update['headers']['status-code']);
-        $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
         /**
          * Test against failure

From 7687784515ab4e0f78cf8f7d024281a968dff341 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 26 Feb 2025 16:41:26 +0000
Subject: [PATCH 07/19] chore: added fallback to old values in update

---
 app/controllers/api/databases.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index a4b5683512..e14c504234 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -299,6 +299,9 @@ function updateAttribute(
     switch ($attribute->getAttribute('format')) {
         case APP_DATABASE_ATTRIBUTE_INT_RANGE:
         case APP_DATABASE_ATTRIBUTE_FLOAT_RANGE:
+            $min ??= $attribute->getAttribute('formatOptions')['min'];
+            $max ??= $attribute->getAttribute('formatOptions')['max'];
+
             if ($min > $max) {
                 throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
             }
@@ -1550,8 +1553,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
 
         // Ensure attribute default is within range
-        $min = \is_null($min) ? PHP_INT_MIN : $min;
-        $max = \is_null($max) ? PHP_INT_MAX : $max;
+        $min ??= PHP_INT_MIN;
+        $max ??= PHP_INT_MAX;
 
         if ($min > $max) {
             throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
@@ -1627,8 +1630,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
 
         // Ensure attribute default is within range
-        $min = \is_null($min) ? -PHP_FLOAT_MAX : $min;
-        $max = \is_null($max) ? PHP_FLOAT_MAX : $max;
+        $min ??= -PHP_FLOAT_MAX;
+        $max ??= PHP_FLOAT_MAX;
 
         if ($min > $max) {
             throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
@@ -2347,11 +2350,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
     ->inject('dbForProject')
     ->inject('queueForEvents')
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, ?string $newKey, Response $response, Database $dbForProject, Event $queueForEvents) {
-
-        // Ensure attribute default is within range
-        $min = \is_null($min) ? PHP_INT_MIN : $min;
-        $max = \is_null($max) ? PHP_INT_MAX : $max;
-
         $attribute = updateAttribute(
             databaseId: $databaseId,
             collectionId: $collectionId,
@@ -2411,11 +2409,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
     ->inject('dbForProject')
     ->inject('queueForEvents')
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, ?string $newKey, Response $response, Database $dbForProject, Event $queueForEvents) {
-
-        // Ensure attribute default is within range
-        $min = \is_null($min) ? -PHP_FLOAT_MAX : $min;
-        $max = \is_null($max) ? PHP_FLOAT_MAX : $max;
-
         $attribute = updateAttribute(
             databaseId: $databaseId,
             collectionId: $collectionId,

From c79ed286b1cc79ba94778acda18983e8052da288 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 26 Feb 2025 17:35:06 +0000
Subject: [PATCH 08/19] chore: update tests

---
 app/controllers/api/databases.php                         | 4 ++--
 .../e2e/Services/Databases/DatabasesCustomServerTest.php  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index e14c504234..876c6bc82a 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -242,8 +242,8 @@ function updateAttribute(
     string $filter = null,
     string|bool|int|float $default = null,
     bool $required = null,
-    int|float $min = null,
-    int|float $max = null,
+    int|float|null $min = null,
+    int|float|null $max = null,
     array $elements = null,
     array $options = [],
     string $newKey = null,
diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 75526b9928..57e0b93634 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -2327,8 +2327,8 @@ class DatabasesCustomServerTest extends Scope
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
             'required' => false,
-            'default' => -10,
-            'max' => 0,
+            'default' => 10,
+            'max' => 100,
         ]);
 
         $this->assertEquals(200, $update['headers']['status-code']);
@@ -2588,8 +2588,8 @@ class DatabasesCustomServerTest extends Scope
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
             'required' => false,
-            'default' => -123.456,
-            'max' => 0.0,
+            'default' => 23.456,
+            'max' => 100.0,
         ]);
 
         $this->assertEquals(200, $update['headers']['status-code']);

From c6b8e649fef5108bcbe70bc54270b01d851cd09b Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 3 Mar 2025 14:34:10 +0000
Subject: [PATCH 09/19] chore: added maxtimeout to testChannelExecutions

---
 tests/e2e/Services/Realtime/RealtimeCustomClientTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
index dda524fc7c..c72dbf85ec 100644
--- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
@@ -1311,6 +1311,8 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals($deployment['headers']['status-code'], 202);
         $this->assertNotEmpty($deployment['body']['$id']);
 
+        $maxTimeSeconds = 10;
+        $startTime = time();
         // Poll until deployment is built
         while (true) {
             $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
@@ -1326,6 +1328,10 @@ class RealtimeCustomClientTest extends Scope
                 break;
             }
 
+            if (time() - $startTime >= $maxTimeSeconds) {
+                throw new \Exception('Deployment timed out after ' . $maxTimeSeconds . ' seconds');
+            }
+
             \sleep(1);
         }
 

From e865ca74d775393d12af377b4f120fd087a4d32b Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 3 Mar 2025 14:41:11 +0000
Subject: [PATCH 10/19] chore: added timeout to webhooks base test

---
 tests/e2e/Services/Webhooks/WebhooksBase.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index 2ef41003ee..ffcb1ce980 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -14,6 +14,8 @@ trait WebhooksBase
 {
     protected function awaitDeploymentIsBuilt($functionId, $deploymentId, $checkForSuccess = true): void
     {
+        $maxTimeSeconds = 10;
+        $startTime = time();
         while (true) {
             $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
                 'content-type' => 'application/json',
@@ -28,6 +30,10 @@ trait WebhooksBase
                 break;
             }
 
+            if (time() - $startTime >= $maxTimeSeconds) {
+                throw new \Exception('Deployment timed out after ' . $maxTimeSeconds . ' seconds');
+            }
+
             \sleep(1);
         }
 

From fc05a4f1e30e164c54e1330ef2cdcb77cd3cc36b Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 3 Mar 2025 16:07:33 +0000
Subject: [PATCH 11/19] chore: updated to use assertEventually

---
 .../Realtime/RealtimeCustomClientTest.php     | 19 ++-----------
 tests/e2e/Services/Webhooks/WebhooksBase.php  | 28 ++++++-------------
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
index c72dbf85ec..e356397408 100644
--- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
@@ -1311,29 +1311,16 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals($deployment['headers']['status-code'], 202);
         $this->assertNotEmpty($deployment['body']['$id']);
 
-        $maxTimeSeconds = 10;
-        $startTime = time();
         // Poll until deployment is built
-        while (true) {
+        $this->assertEventually(function () use ($function, $deploymentId) {
             $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ]);
 
-            if (
-                $deployment['headers']['status-code'] >= 400
-                || \in_array($deployment['body']['status'], ['ready', 'failed'])
-            ) {
-                break;
-            }
-
-            if (time() - $startTime >= $maxTimeSeconds) {
-                throw new \Exception('Deployment timed out after ' . $maxTimeSeconds . ' seconds');
-            }
-
-            \sleep(1);
-        }
+            $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
+        });
 
         $response = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
             'content-type' => 'application/json',
diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index ffcb1ce980..b7985b5be1 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -2,6 +2,7 @@
 
 namespace Tests\E2E\Services\Webhooks;
 
+use Appwrite\Tests\Async;
 use Appwrite\Tests\Retry;
 use CURLFile;
 use Tests\E2E\Client;
@@ -12,35 +13,22 @@ use Utopia\Database\Validator\Datetime as DatetimeValidator;
 
 trait WebhooksBase
 {
+    use Async;
+
     protected function awaitDeploymentIsBuilt($functionId, $deploymentId, $checkForSuccess = true): void
     {
-        $maxTimeSeconds = 10;
-        $startTime = time();
-        while (true) {
+        $this->assertEventually(function () use ($functionId, $deploymentId, $checkForSuccess) {
             $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ]);
 
-            if (
-                $deployment['headers']['status-code'] >= 400
-                || \in_array($deployment['body']['status'], ['ready', 'failed'])
-            ) {
-                break;
+            if ($checkForSuccess) {
+                $this->assertEquals(200, $deployment['headers']['status-code']);
+                $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
             }
-
-            if (time() - $startTime >= $maxTimeSeconds) {
-                throw new \Exception('Deployment timed out after ' . $maxTimeSeconds . ' seconds');
-            }
-
-            \sleep(1);
-        }
-
-        if ($checkForSuccess) {
-            $this->assertEquals(200, $deployment['headers']['status-code']);
-            $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
-        }
+        });
     }
 
     public static function getWebhookSignature(array $webhook, string $signatureKey): string

From fe7aeefabf9f2f1523df07ebfa3a060099688d70 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 3 Mar 2025 16:20:32 +0000
Subject: [PATCH 12/19] chore: remove redundant param

---
 tests/e2e/Services/Webhooks/WebhooksBase.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index b7985b5be1..c743810feb 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -15,19 +15,17 @@ trait WebhooksBase
 {
     use Async;
 
-    protected function awaitDeploymentIsBuilt($functionId, $deploymentId, $checkForSuccess = true): void
+    protected function awaitDeploymentIsBuilt($functionId, $deploymentId): void
     {
-        $this->assertEventually(function () use ($functionId, $deploymentId, $checkForSuccess) {
+        $this->assertEventually(function () use ($functionId, $deploymentId) {
             $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ]);
 
-            if ($checkForSuccess) {
-                $this->assertEquals(200, $deployment['headers']['status-code']);
-                $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
-            }
+            $this->assertEquals(200, $deployment['headers']['status-code']);
+            $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
         });
     }
 

From 9a6de87f7dcbdeff0d6c70f18cb1923ed87c2a6b Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 3 Mar 2025 16:31:41 +0000
Subject: [PATCH 13/19] chore: usagetest and migrationsbase

---
 tests/e2e/General/UsageTest.php               | 67 ++++++++-----------
 .../Services/Migrations/MigrationsBase.php    | 23 +++----
 2 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/tests/e2e/General/UsageTest.php b/tests/e2e/General/UsageTest.php
index df780d8f47..27d521aa6a 100644
--- a/tests/e2e/General/UsageTest.php
+++ b/tests/e2e/General/UsageTest.php
@@ -1142,49 +1142,38 @@ class UsageTest extends Scope
 
         $tries = 0;
 
-        while (true) {
-            try {
-                // Compare new values with old values
-                $response = $this->client->call(
-                    Client::METHOD_GET,
-                    '/functions/' . $functionId . '/usage?range=30d',
-                    $this->getConsoleHeaders()
-                );
+        $this->assertEventually(function () use ($functionId, $functionsMetrics, $projectMetrics) {
+            // Compare new values with old values
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/functions/' . $functionId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-                $this->assertEquals(200, $response['headers']['status-code']);
-                $this->assertEquals(19, count($response['body']));
-                $this->assertEquals('30d', $response['body']['range']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(19, count($response['body']));
+            $this->assertEquals('30d', $response['body']['range']);
 
-                // Check if the new values are greater than the old values
-                $this->assertEquals($functionsMetrics['executionsTotal'] + 1, $response['body']['executionsTotal']);
-                $this->assertGreaterThan($functionsMetrics['executionsTimeTotal'], $response['body']['executionsTimeTotal']);
-                $this->assertGreaterThan($functionsMetrics['executionsMbSecondsTotal'], $response['body']['executionsMbSecondsTotal']);
+            // Check if the new values are greater than the old values
+            $this->assertEquals($functionsMetrics['executionsTotal'] + 1, $response['body']['executionsTotal']);
+            $this->assertGreaterThan($functionsMetrics['executionsTimeTotal'], $response['body']['executionsTimeTotal']);
+            $this->assertGreaterThan($functionsMetrics['executionsMbSecondsTotal'], $response['body']['executionsMbSecondsTotal']);
 
-                $response = $this->client->call(
-                    Client::METHOD_GET,
-                    '/project/usage',
-                    $this->getConsoleHeaders(),
-                    [
-                        'period' => '1h',
-                        'startDate' => self::getToday(),
-                        'endDate' => self::getTomorrow(),
-                    ]
-                );
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1h',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
 
-                $this->assertEquals(200, $response['headers']['status-code']);
-                $this->assertEquals($projectMetrics['executionsTotal'] + 1, $response['body']['executionsTotal']);
-                $this->assertGreaterThan($projectMetrics['executionsMbSecondsTotal'], $response['body']['executionsMbSecondsTotal']);
-
-                break;
-            } catch (ExpectationFailedException $th) {
-                if ($tries >= 5) {
-                    throw $th;
-                } else {
-                    $tries++;
-                    sleep(5);
-                }
-            }
-        }
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals($projectMetrics['executionsTotal'] + 1, $response['body']['executionsTotal']);
+            $this->assertGreaterThan($projectMetrics['executionsMbSecondsTotal'], $response['body']['executionsMbSecondsTotal']);
+        });
     }
 
     public function tearDown(): void
diff --git a/tests/e2e/Services/Migrations/MigrationsBase.php b/tests/e2e/Services/Migrations/MigrationsBase.php
index 381706f5ee..6c468ee730 100644
--- a/tests/e2e/Services/Migrations/MigrationsBase.php
+++ b/tests/e2e/Services/Migrations/MigrationsBase.php
@@ -53,8 +53,9 @@ trait MigrationsBase
         $this->assertNotEmpty($migration['body']);
         $this->assertNotEmpty($migration['body']['$id']);
 
-        $attempts = 0;
-        while ($attempts < 5) {
+        $migrationResult = [];
+
+        $this->assertEventually(function () use ($migration, &$migrationResult) {
             $response = $this->client->call(Client::METHOD_GET, '/migrations/' . $migration['body']['$id'], [
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getDestinationProject()['$id'],
@@ -66,24 +67,18 @@ trait MigrationsBase
             $this->assertNotEmpty($response['body']['$id']);
 
             if ($response['body']['status'] === 'failed') {
-                $this->fail('Migration failed', json_encode($response['body'], JSON_PRETTY_PRINT));
+                $this->fail('Migration failed' . json_encode($response['body'], JSON_PRETTY_PRINT));
             }
 
             $this->assertNotEquals('failed', $response['body']['status']);
+            $this->assertEquals('completed', $response['body']['status']);
 
-            if ($response['body']['status'] === 'completed') {
-                return $response['body'];
-            }
+            $migrationResult = $response['body'];
 
-            if ($attempts === 4) {
-                $this->assertEquals('completed', $response['body']['status']);
-            }
+            return true;
+        });
 
-            $attempts++;
-            sleep(5);
-        }
-
-        return [];
+        return $migrationResult;
     }
 
     /**

From 1d2883f47250b45837d87905c8ffcf0d4b480f5f Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 5 Mar 2025 04:46:06 +0000
Subject: [PATCH 14/19] chore: fix model for image transformations in usage
 project

---
 src/Appwrite/Utopia/Response/Model/UsageProject.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Appwrite/Utopia/Response/Model/UsageProject.php b/src/Appwrite/Utopia/Response/Model/UsageProject.php
index 6ac8830ac5..6737cbf6ef 100644
--- a/src/Appwrite/Utopia/Response/Model/UsageProject.php
+++ b/src/Appwrite/Utopia/Response/Model/UsageProject.php
@@ -197,18 +197,19 @@ class UsageProject extends Model
                 'example' => [],
                 'array' => true
             ])
+            ->addRule('imageTransformations', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'An array of aggregated number of image transformations.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
             ->addRule('imageTransformationsTotal', [
                 'type' => self::TYPE_INTEGER,
                 'description' => 'An array of aggregated number of image transformations.',
                 'default' => 0,
                 'example' => 0,
             ])
-            ->addRule('imageTransformations', [
-                'type' => self::TYPE_INTEGER,
-                'description' => 'Total aggregated number of image transformations.',
-                'default' => 0,
-                'example' => 0,
-            ])
         ;
     }
 

From 2c6f731a3820333a18fbcafbd43f478349f0a0bd Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 5 Mar 2025 04:49:34 +0000
Subject: [PATCH 15/19] fix: description

---
 src/Appwrite/Utopia/Response/Model/UsageProject.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Appwrite/Utopia/Response/Model/UsageProject.php b/src/Appwrite/Utopia/Response/Model/UsageProject.php
index 6737cbf6ef..395b19b7cd 100644
--- a/src/Appwrite/Utopia/Response/Model/UsageProject.php
+++ b/src/Appwrite/Utopia/Response/Model/UsageProject.php
@@ -206,7 +206,7 @@ class UsageProject extends Model
             ])
             ->addRule('imageTransformationsTotal', [
                 'type' => self::TYPE_INTEGER,
-                'description' => 'An array of aggregated number of image transformations.',
+                'description' => 'Total aggregated number of image transformations.',
                 'default' => 0,
                 'example' => 0,
             ])

From 6024d01e7ba7413ce462f09064b9a2abfd502a88 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 5 Mar 2025 05:25:50 +0000
Subject: [PATCH 16/19] Feat: calculate database storage in stats-resources

- Calculate database storage in stats-resources worker
---
 .../Platform/Workers/StatsResources.php       | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/StatsResources.php b/src/Appwrite/Platform/Workers/StatsResources.php
index 62046bd186..969d43e895 100644
--- a/src/Appwrite/Platform/Workers/StatsResources.php
+++ b/src/Appwrite/Platform/Workers/StatsResources.php
@@ -182,7 +182,7 @@ class StatsResources extends Action
             }
 
             try {
-                $this->countForDatabase($dbForProject, $dbForLogs, $region);
+                $this->countForDatabase($dbForProject, $region);
             } catch (Throwable $th) {
                 call_user_func_array($this->logError, [$th, "StatsResources", "count_for_database_{$project->getId()}"]);
             }
@@ -242,42 +242,54 @@ class StatsResources extends Action
         $this->createStatsDocuments($region, METRIC_FILES_IMAGES_TRANSFORMED, $totalImageTransformations);
     }
 
-    protected function countForDatabase(Database $dbForProject, Database $dbForLogs, string $region)
+    protected function countForDatabase(Database $dbForProject, string $region)
     {
         $totalCollections = 0;
         $totalDocuments = 0;
 
-        $this->foreachDocument($dbForProject, 'databases', [], function ($database) use ($dbForProject, $dbForLogs, $region, &$totalCollections, &$totalDocuments) {
+        $totalDatabaseStorage = 0;
+
+        $this->foreachDocument($dbForProject, 'databases', [], function ($database) use ($dbForProject, $region, &$totalCollections, &$totalDocuments, &$totalDatabaseStorage) {
             $collections = $dbForProject->count('database_' . $database->getInternalId());
 
             $metric = str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_COLLECTIONS);
             $this->createStatsDocuments($region, $metric, $collections);
 
-            $documents = $this->countForCollections($dbForProject, $dbForLogs, $database, $region);
+            [$documents, $storage] = $this->countForCollections($dbForProject, $database, $region);
 
+            $totalDatabaseStorage += $storage;
             $totalDocuments += $documents;
             $totalCollections += $collections;
         });
 
         $this->createStatsDocuments($region, METRIC_COLLECTIONS, $totalCollections);
         $this->createStatsDocuments($region, METRIC_DOCUMENTS, $totalDocuments);
+        $this->createStatsDocuments($region, METRIC_DATABASES_STORAGE, $totalDatabaseStorage);
     }
-    protected function countForCollections(Database $dbForProject, Database $dbForLogs, Document $database, string $region): int
+    protected function countForCollections(Database $dbForProject, Document $database, string $region): array
     {
         $databaseDocuments = 0;
-        $this->foreachDocument($dbForProject, 'database_' . $database->getInternalId(), [], function ($collection) use ($dbForProject, $dbForLogs, $database, $region, &$totalCollections, &$databaseDocuments) {
+        $databaseStorage = 0;
+        $this->foreachDocument($dbForProject, 'database_' . $database->getInternalId(), [], function ($collection) use ($dbForProject, $database, $region, &$databaseStorage, &$databaseDocuments) {
             $documents = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());
-
             $metric = str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS);
             $this->createStatsDocuments($region, $metric, $documents);
-
             $databaseDocuments += $documents;
+
+            $collectionStorage = $dbForProject->getSizeOfCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());
+            $metric = str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE);
+            $this->createStatsDocuments($region, $metric, $collectionStorage);
+            $databaseStorage += $collectionStorage;
+
         });
 
         $metric = str_replace(['{databaseInternalId}'], [$database->getInternalId()], METRIC_DATABASE_ID_DOCUMENTS);
         $this->createStatsDocuments($region, $metric, $databaseDocuments);
 
-        return $databaseDocuments;
+        $metric = str_replace(['{databaseInternalId}'], [$database->getInternalId()], METRIC_DATABASE_ID_STORAGE);
+        $this->createStatsDocuments($region, $metric, $databaseStorage);
+
+        return [$databaseDocuments, $databaseStorage];
     }
 
     protected function countForFunctions(Database $dbForProject, Database $dbForLogs, string $region)

From 2afb8a14ac7f541eda336cd85c71e76e31e4b83d Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 5 Mar 2025 05:27:56 +0000
Subject: [PATCH 17/19] Skip in dual writing

---
 src/Appwrite/Platform/Workers/StatsUsageDump.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Appwrite/Platform/Workers/StatsUsageDump.php b/src/Appwrite/Platform/Workers/StatsUsageDump.php
index 81acd4e4b0..119a9e7288 100644
--- a/src/Appwrite/Platform/Workers/StatsUsageDump.php
+++ b/src/Appwrite/Platform/Workers/StatsUsageDump.php
@@ -48,6 +48,7 @@ class StatsUsageDump extends Action
         METRIC_BUILDS => true,
         METRIC_COLLECTIONS => true,
         METRIC_DOCUMENTS => true,
+        METRIC_DATABASES_STORAGE => true,
     ];
 
     /**
@@ -63,6 +64,7 @@ class StatsUsageDump extends Action
         '.deployments.storage',
         '.builds',
         '.builds.storage',
+        '.databases.storage'
     ];
 
     /**

From 0ce4555f70312b0d9f1de93d91f96f2ed70d3192 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 5 Mar 2025 17:42:43 +0000
Subject: [PATCH 18/19] chore: added auth group to create phone token

---
 app/controllers/api/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index a634618e6e..20f64496ac 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -2400,7 +2400,7 @@ App::put('/v1/account/sessions/phone')
 App::post('/v1/account/tokens/phone')
     ->alias('/v1/account/sessions/phone')
     ->desc('Create phone token')
-    ->groups(['api', 'account'])
+    ->groups(['api', 'account', 'auth'])
     ->label('scope', 'sessions.write')
     ->label('auth.type', 'phone')
     ->label('audits.event', 'session.create')

From 36b047529843dc23f3b94d2b23cb2fb6c2f0b36b Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 5 Mar 2025 18:40:41 +0000
Subject: [PATCH 19/19] chore: update tests

---
 .../Account/AccountCustomClientTest.php       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/e2e/Services/Account/AccountCustomClientTest.php b/tests/e2e/Services/Account/AccountCustomClientTest.php
index 439fa24fb6..daa5bcbff8 100644
--- a/tests/e2e/Services/Account/AccountCustomClientTest.php
+++ b/tests/e2e/Services/Account/AccountCustomClientTest.php
@@ -2419,6 +2419,33 @@ class AccountCustomClientTest extends Scope
         $message = $smsRequest['data']['message'];
         $token = substr($message, 0, 6);
 
+        /**
+         * Test for FAILURE
+         */
+
+        // disable phone sessions
+        $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $this->getProject()['$id'] . '/auth/phone', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => 'console',
+            'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+        ]), [
+            'status' => false,
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals(false, $response['body']['authPhone']);
+
+        $response = $this->client->call(Client::METHOD_POST, '/account/verification/phone', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+        ]));
+
+        $this->assertEquals(501, $response['headers']['status-code']);
+        $this->assertEquals("Phone authentication is disabled for this project", $response['body']['message']);
+
         return \array_merge($data, [
             'token' => \substr($smsRequest['data']['message'], 0, 6)
         ]);