From e1368231b2fb07f25f495f7cf3698ccb3454d9d2 Mon Sep 17 00:00:00 2001
From: shimon <shimon@appwrite.io>
Date: Tue, 6 Dec 2022 16:17:56 +0200
Subject: [PATCH] updates

---
 app/controllers/shared/api.php | 5 +++--
 app/workers/usage.php          | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 34eeca9d87..979a0cbb82 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -55,6 +55,7 @@ $databaseListener = function (string $event, Document $document, Document $proje
         $value = -1;
     }
     var_dump($document->getCollection());
+
     switch (true) {
         case $document->getCollection() === 'users':
             $queueForUsage->addMetric("{$project->getId()}", "users", $value); // per project
@@ -90,8 +91,8 @@ $databaseListener = function (string $event, Document $document, Document $proje
             $queueForUsage->addMetric("{$project->getId()}", "functions", $value); // per project
             break;
         case $document->getCollection() === 'deployments':
-            $queueForUsage->addMetric("{$project->getId()}.{$document['functionId']}", "deployments", $value); // per function
-            $queueForUsage->addMetric("{$project->getId()}.{$document['functionId']}", "deployments.storage", $document->getAttribute('size') * $value); // per function
+            $queueForUsage->addMetric("{$project->getId()}.{$document['resourceId']}", "deployments", $value); // per function
+            $queueForUsage->addMetric("{$project->getId()}.{$document['resourceId']}", "deployments.storage", $document->getAttribute('size') * $value); // per function
             $queueForUsage->addMetric("{$project->getId()}", "deployments", $value); // per project
             $queueForUsage->addMetric("{$project->getId()}", "deployments.storage", $document->getAttribute('size') * $value); // per project
             break;
diff --git a/app/workers/usage.php b/app/workers/usage.php
index 1c1e4d2dcd..b86dcd6f90 100644
--- a/app/workers/usage.php
+++ b/app/workers/usage.php
@@ -4,6 +4,7 @@ require_once __DIR__ . '/../worker.php';
 
 use Swoole\Table;
 use Swoole\Timer;
+use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
@@ -96,7 +97,7 @@ $server
                                         'metric' => $metric['key'],
                                         'value' => $metric['value'],
                                         'type' => 0,
-                                        'region' => 'default',
+                                        'region' => App::getEnv('_APP_REGION', 'default'),
                                     ])));
                                 } else {
                                     $value = $document->getAttribute('value') + $metric['value'];