From 080350f7ad350b709291c481550ff1b1a825d278 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 8 Apr 2025 08:52:12 +0000 Subject: [PATCH] Fix data types and response --- .../Modules/Functions/Http/Usage/Get.php | 10 ++++++---- .../Modules/Functions/Http/Usage/XList.php | 10 ++++++++-- src/Appwrite/Utopia/Response/Model/UsageSite.php | 12 ++++++------ .../Utopia/Response/Model/UsageSites.php | 16 ++++++++-------- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php b/src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php index 8c6a2bc741..94eed94a17 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php @@ -131,13 +131,15 @@ class Get extends Base 'deploymentsTotal' => $usage[$metrics[0]]['total'], 'deploymentsStorageTotal' => $usage[$metrics[1]]['total'], 'buildsTotal' => $usage[$metrics[2]]['total'], - 'buildsSuccess' => $usage[$metrics[9]]['total'], - 'buildsFailed' => $usage[$metrics[10]]['total'], + 'buildsSuccessTotal' => $usage[$metrics[9]]['total'], + 'buildsFailedTotal' => $usage[$metrics[10]]['total'], 'buildsStorageTotal' => $usage[$metrics[3]]['total'], 'buildsTimeTotal' => $usage[$metrics[4]]['total'], 'buildsTimeAverage' => (int) ($usage[$metrics[4]]['total'] / $usage[$metrics[2]]['total']), 'executionsTotal' => $usage[$metrics[5]]['total'], 'executionsTimeTotal' => $usage[$metrics[6]]['total'], + 'buildsMbSecondsTotal' => $usage[$metrics[7]]['total'], + 'executionsMbSecondsTotal' => $usage[$metrics[8]]['total'], 'deployments' => $usage[$metrics[0]]['data'], 'deploymentsStorage' => $usage[$metrics[1]]['data'], 'builds' => $usage[$metrics[2]]['data'], @@ -145,10 +147,10 @@ class Get extends Base 'buildsTime' => $usage[$metrics[4]]['data'], 'executions' => $usage[$metrics[5]]['data'], 'executionsTime' => $usage[$metrics[6]]['data'], - 'buildsMbSecondsTotal' => $usage[$metrics[7]]['total'], 'buildsMbSeconds' => $usage[$metrics[7]]['data'], 'executionsMbSeconds' => $usage[$metrics[8]]['data'], - 'executionsMbSecondsTotal' => $usage[$metrics[8]]['total'] + 'buildsSuccess' => $usage[$metrics[9]]['data'], + 'buildsFailed' => $usage[$metrics[10]]['data'], ]), Response::MODEL_USAGE_FUNCTION); } } diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php b/src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php index 0e652e23b2..e4a7c01bdf 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php @@ -70,6 +70,8 @@ class XList extends Base str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_EXECUTIONS_COMPUTE), str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_BUILDS_MB_SECONDS), str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_EXECUTIONS_MB_SECONDS), + str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_BUILDS_SUCCESS), + str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_BUILDS_FAILED), ]; Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) { @@ -125,6 +127,10 @@ class XList extends Base 'buildsTimeTotal' => $usage[$metrics[5]]['total'], 'executionsTotal' => $usage[$metrics[6]]['total'], 'executionsTimeTotal' => $usage[$metrics[7]]['total'], + 'buildsMbSecondsTotal' => $usage[$metrics[8]]['total'], + 'executionsMbSecondsTotal' => $usage[$metrics[9]]['total'], + 'buildsSuccessTotal' => $usage[$metrics[10]]['total'], + 'buildsFailedTotal' => $usage[$metrics[11]]['total'], 'functions' => $usage[$metrics[0]]['data'], 'deployments' => $usage[$metrics[1]]['data'], 'deploymentsStorage' => $usage[$metrics[2]]['data'], @@ -133,10 +139,10 @@ class XList extends Base 'buildsTime' => $usage[$metrics[5]]['data'], 'executions' => $usage[$metrics[6]]['data'], 'executionsTime' => $usage[$metrics[7]]['data'], - 'buildsMbSecondsTotal' => $usage[$metrics[8]]['total'], 'buildsMbSeconds' => $usage[$metrics[8]]['data'], 'executionsMbSeconds' => $usage[$metrics[9]]['data'], - 'executionsMbSecondsTotal' => $usage[$metrics[9]]['total'], + 'buildsSuccess' => $usage[$metrics[10]]['data'], + 'buildsFailed' => $usage[$metrics[11]]['data'], ]), Response::MODEL_USAGE_FUNCTIONS); } } diff --git a/src/Appwrite/Utopia/Response/Model/UsageSite.php b/src/Appwrite/Utopia/Response/Model/UsageSite.php index 594513cf63..b945032b6b 100644 --- a/src/Appwrite/Utopia/Response/Model/UsageSite.php +++ b/src/Appwrite/Utopia/Response/Model/UsageSite.php @@ -19,8 +19,8 @@ class UsageSite extends UsageFunction ->addRule('requests', [ 'type' => Response::MODEL_METRIC, 'description' => 'Aggregated number of sites per period.', - 'default' => 0, - 'example' => 0, + 'default' => [], + 'example' => [], 'array' => true ]) ->addRule('inboundTotal', [ @@ -32,8 +32,8 @@ class UsageSite extends UsageFunction ->addRule('inbound', [ 'type' => Response::MODEL_METRIC, 'description' => 'Aggregated number of sites per period.', - 'default' => 0, - 'example' => 0, + 'default' => [], + 'example' => [], 'array' => true ]) ->addRule('outboundTotal', [ @@ -45,8 +45,8 @@ class UsageSite extends UsageFunction ->addRule('outbound', [ 'type' => Response::MODEL_METRIC, 'description' => 'Aggregated number of sites per period.', - 'default' => 0, - 'example' => 0, + 'default' => [], + 'example' => [], 'array' => true ]) ; diff --git a/src/Appwrite/Utopia/Response/Model/UsageSites.php b/src/Appwrite/Utopia/Response/Model/UsageSites.php index b3de95cb82..d983982937 100644 --- a/src/Appwrite/Utopia/Response/Model/UsageSites.php +++ b/src/Appwrite/Utopia/Response/Model/UsageSites.php @@ -21,8 +21,8 @@ class UsageSites extends UsageFunctions ->addRule('sites', [ 'type' => Response::MODEL_METRIC, 'description' => 'Aggregated number of sites per period.', - 'default' => 0, - 'example' => 0, + 'default' => [], + 'example' => [], 'array' => true ]) ->addRule('requestsTotal', [ @@ -34,8 +34,8 @@ class UsageSites extends UsageFunctions ->addRule('requests', [ 'type' => Response::MODEL_METRIC, 'description' => 'Aggregated number of sites per period.', - 'default' => 0, - 'example' => 0, + 'default' => [], + 'example' => [], 'array' => true ]) ->addRule('inboundTotal', [ @@ -47,8 +47,8 @@ class UsageSites extends UsageFunctions ->addRule('inbound', [ 'type' => Response::MODEL_METRIC, 'description' => 'Aggregated number of sites per period.', - 'default' => 0, - 'example' => 0, + 'default' => [], + 'example' => [], 'array' => true ]) ->addRule('outboundTotal', [ @@ -60,8 +60,8 @@ class UsageSites extends UsageFunctions ->addRule('outbound', [ 'type' => Response::MODEL_METRIC, 'description' => 'Aggregated number of sites per period.', - 'default' => 0, - 'example' => 0, + 'default' => [], + 'example' => [], 'array' => true ]) ;