Merge branch '1.5.x' of github.com:appwrite/appwrite into migration-clean-cache

app/controllers/api/project.php

@@ -44,7 +44,8 @@ App::get('/v1/project/usage')
                 METRIC_DATABASES,
                 METRIC_USERS,
                 METRIC_BUCKETS,
-                METRIC_FILES_STORAGE
+                METRIC_FILES_STORAGE,
+                METRIC_DEPLOYMENTS_STORAGE
             ],
             'period' => [
                 METRIC_NETWORK_REQUESTS,
@@ -144,6 +145,22 @@ App::get('/v1/project/usage')
             ];
         }, $dbForProject->find('buckets'));
 
+        $deploymentsStorageBreakdown = array_map(function ($function) use ($dbForProject) {
+            $id = $function->getId();
+            $name = $function->getAttribute('name');
+            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE);
+            $value = $dbForProject->findOne('stats', [
+                Query::equal('metric', [$metric]),
+                Query::equal('period', ['inf'])
+            ]);
+
+            return [
+                'resourceId' => $id,
+                'name' => $name,
+                'value' => $value['value'] ?? 0,
+            ];
+        }, $dbForProject->find('functions'));
+
         // merge network inbound + outbound
         $projectBandwidth = [];
         foreach ($usage[METRIC_NETWORK_INBOUND] as $item) {
@@ -176,8 +193,10 @@ App::get('/v1/project/usage')
             'usersTotal' => $total[METRIC_USERS],
             'bucketsTotal' => $total[METRIC_BUCKETS],
             'filesStorageTotal' => $total[METRIC_FILES_STORAGE],
+            'deploymentsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE],
             'executionsBreakdown' => $executionsBreakdown,
-            'bucketsBreakdown' => $bucketsBreakdown
+            'bucketsBreakdown' => $bucketsBreakdown,
+            'deploymentsStorageBreakdown' => $deploymentsStorageBreakdown,
         ]), Response::MODEL_USAGE_PROJECT);
     });
 

src/Appwrite/Platform/Workers/Builds.php

@@ -318,6 +318,9 @@ class Builds extends Action
                     throw new \Exception("Unable to move file");
                 }
 
+                $deployment->setAttribute('path', $path);
+                $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
+
                 Console::execute('rm -rf ' . $tmpPath, '', $stdout, $stderr);
 
                 $source = $path;

src/Appwrite/Utopia/Response/Model/UsageProject.php

@@ -40,6 +40,12 @@ class UsageProject extends Model
                 'default' => 0,
                 'example' => 0,
             ])
+            ->addRule('deploymentsStorageTotal', [
+                'type' => self::TYPE_INTEGER,
+                'description' => 'Total aggregated sum of deployments storage size (in bytes).',
+                'default' => 0,
+                'example' => 0,
+            ])
             ->addRule('bucketsTotal', [
                 'type' => self::TYPE_INTEGER,
                 'description' => 'Total aggregated number of buckets.',
@@ -88,6 +94,13 @@ class UsageProject extends Model
                 'example' => [],
                 'array' => true
             ])
+            ->addRule('deploymentsStorageBreakdown', [
+                'type' => Response::MODEL_METRIC_BREAKDOWN,
+                'description' => 'Aggregated breakdown in totals of deployments storage size (in bytes).',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
         ;
     }
 

tests/e2e/General/UsageTest.php

@@ -140,7 +140,7 @@ class UsageTest extends Scope
         );
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(12, count($response['body']));
+        $this->assertEquals(14, count($response['body']));
         $this->validateDates($response['body']['network']);
         $this->validateDates($response['body']['requests']);
         $this->validateDates($response['body']['users']);
@@ -321,7 +321,7 @@ class UsageTest extends Scope
             ]
         );
 
-        $this->assertEquals(12, count($response['body']));
+        $this->assertEquals(14, count($response['body']));
         $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']);
@@ -542,7 +542,7 @@ class UsageTest extends Scope
             ]
         );
 
-        $this->assertEquals(12, count($response['body']));
+        $this->assertEquals(14, count($response['body']));
         $this->assertEquals(1, count($response['body']['requests']));
         $this->assertEquals(1, count($response['body']['network']));
         $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
@@ -778,6 +778,7 @@ class UsageTest extends Scope
         $this->assertEquals('30d', $response['body']['range']);
         $this->assertIsArray($response['body']['deployments']);
         $this->assertIsArray($response['body']['deploymentsStorage']);
+        $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
         $this->assertIsArray($response['body']['builds']);
         $this->assertIsArray($response['body']['buildsTime']);
         $this->assertIsArray($response['body']['executions']);

tests/e2e/Services/Projects/ProjectsConsoleClientTest.php

@@ -484,6 +484,7 @@ class ProjectsConsoleClientTest extends Scope
         $this->assertIsNumeric($response['body']['bucketsTotal']);
         $this->assertIsNumeric($response['body']['usersTotal']);
         $this->assertIsNumeric($response['body']['filesStorageTotal']);
+        $this->assertIsNumeric($response['body']['deploymentStorageTotal']);
 
 
         /**