Merge branch '1.6.x' into fix-file-storage-usage

app/controllers/shared/api.php

@@ -149,9 +149,9 @@ $usageDatabaseListener = function (string $event, Document $document, StatsUsage
             $bucketInternalId  = $parts[1];
             $queueForStatsUsage
                 ->addMetric(METRIC_FILES, $value) // per project
-                ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeOriginal') * $value) // per project
+                ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeActual') * $value) // per project
                 ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES), $value) // per bucket
-                ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeOriginal') * $value); // per bucket
+                ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeActual') * $value); // per bucket
             break;
         case $document->getCollection() === 'functions':
             $queueForStatsUsage

tests/e2e/General/UsageTest.php

@@ -335,7 +335,7 @@ class UsageTest extends Scope
         $this->assertEquals(1, count($response['body']['requests']));
         $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
         $this->validateDates($response['body']['requests']);
-        $this->assertEquals($storageTotal, $response['body']['filesStorageTotal']);
+        $this->assertGreaterThan($storageTotal, $response['body']['filesStorageTotal']);
 
         $response = $this->client->call(
             Client::METHOD_GET,
@@ -343,7 +343,7 @@ class UsageTest extends Scope
             $this->getConsoleHeaders()
         );
 
-        $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
+        $this->assertGreaterThan($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
         $this->validateDates($response['body']['storage']);
         $this->assertEquals($bucketsTotal, $response['body']['buckets'][array_key_last($response['body']['buckets'])]['value']);
         $this->validateDates($response['body']['buckets']);
@@ -356,7 +356,7 @@ class UsageTest extends Scope
             $this->getConsoleHeaders()
         );
 
-        $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
+        $this->assertGreaterThan($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
         $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
 
         return $data;