From d80bd75b6df14f8abad607c1db4c87aca5a34d8a Mon Sep 17 00:00:00 2001
From: shimon <shimon@appwrite.io>
Date: Mon, 12 Dec 2022 09:54:53 +0200
Subject: [PATCH] usage cleanup

---
 app/controllers/api/project.php                    | 14 ++++++++------
 app/controllers/shared/api.php                     |  1 +
 app/init.php                                       |  3 ++-
 .../Utopia/Response/Model/UsageProject.php         |  7 +++++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/project.php b/app/controllers/api/project.php
index 5665780b90..cfcf8e9585 100644
--- a/app/controllers/api/project.php
+++ b/app/controllers/api/project.php
@@ -29,6 +29,7 @@ App::get('/v1/project/usage')
         $stats = $usage = [];
         $days = $periods[$range];
         $metrics = [
+            'requests',
             'network.inbound',
             'network.outbound',
             'executions',
@@ -79,12 +80,13 @@ App::get('/v1/project/usage')
 
         $response->dynamic(new Document([
             'range' => $range,
-            'network' => ($usage[$metrics[0]] + $usage[$metrics[1]]),
-            'executions' => $usage[$metrics[2]],
-            'documents' => $usage[$metrics[3]],
-            'databases' => $usage[$metrics[4]],
-            'users' => $usage[$metrics[5]],
-            'storage' => $usage[$metrics[6]],
+            'requests' => ($usage[$metrics[0]]),
+            'network' => ($usage[$metrics[1]] + $usage[$metrics[2]]),
+            'executions' => $usage[$metrics[3]],
+            'documents' => $usage[$metrics[4]],
+            'databases' => $usage[$metrics[5]],
+            'users' => $usage[$metrics[6]],
+            'storage' => $usage[$metrics[7]],
             'buckets' => $usage[$metrics[8]],
         ]), Response::MODEL_USAGE_PROJECT);
     });
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 2432751972..c81568a70a 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -64,6 +64,7 @@ $databaseListener = function (string $event, array $args, Document $project, Usa
             $queueForUsage->addMetric("teams", $value); // per project
             break;
         case $document->getCollection() === 'users':
+            var_dump($document);
             $queueForUsage->addMetric("users", $value); // per project
             break;
         case $document->getCollection() === 'sessions': // Todo sessions count offset issue
diff --git a/app/init.php b/app/init.php
index b253bae8d1..0516d9d3e7 100644
--- a/app/init.php
+++ b/app/init.php
@@ -39,6 +39,7 @@ use Appwrite\Network\Validator\URL;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\URL\URL as AppwriteURL;
 use Utopia\App;
+use Utopia\Queue\Connection;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 use Utopia\Database\ID;
@@ -96,7 +97,7 @@ const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate pe
 const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
 const APP_CACHE_BUSTER = 501;
-const APP_VERSION_STABLE = '1.1.2';
+const APP_VERSION_STABLE = '1.1.1';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
diff --git a/src/Appwrite/Utopia/Response/Model/UsageProject.php b/src/Appwrite/Utopia/Response/Model/UsageProject.php
index ae099785e5..e37bc5928d 100644
--- a/src/Appwrite/Utopia/Response/Model/UsageProject.php
+++ b/src/Appwrite/Utopia/Response/Model/UsageProject.php
@@ -16,6 +16,13 @@ class UsageProject extends Model
                 'default' => '',
                 'example' => '30d',
             ])
+            ->addRule('requests', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for number of requests.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
             ->addRule('network', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for consumed bandwidth.',