Merge branch 'cl-1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn

This commit is contained in:
shimon 2023-10-16 17:03:43 +03:00
commit 2fcda9fc11
3 changed files with 9 additions and 8 deletions

2
.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "app/console"]
path = app/console
url = https://github.com/appwrite/console
branch = 3.2.1
branch = 3.2.2

@ -1 +1 @@
Subproject commit 2f47e4e77b3c832679c5a83a604dd7b8e8fc1903
Subproject commit 0f9e5e78396dcfe8b2a02131afe874bd84ba4085

View file

@ -155,12 +155,12 @@ class CalcTierStats extends Action
}
/** Get Usage stats */
$range = '90d';
$range = '30d';
$periods = [
'90d' => [
'30d' => [
'period' => '1d',
'limit' => 90,
],
'limit' => 30,
]
];
$tmp = [];
@ -200,8 +200,9 @@ class CalcTierStats extends Action
try {
/** Get Domains */
$stats['Domains'] = $dbForConsole->count('domains', [
$stats['Domains'] = $dbForConsole->count('rules', [
Query::equal('projectInternalId', [$project->getInternalId()]),
Query::limit(APP_LIMIT_COUNT)
]);
} catch (\Throwable) {
$stats['Domains'] = 0;
@ -246,7 +247,7 @@ class CalcTierStats extends Action
if (empty($file)) {
continue;
}
$filesSum += $dbForProject->sum('bucket_' . $bucket->getInternalId(), 'sizeOriginal', [], 0);
$filesSum += $dbForProject->sum('bucket_' . $bucket->getInternalId(), 'sizeOriginal', []);
$filesCount += $dbForProject->count('bucket_' . $bucket->getInternalId(), []);
if ($file->getAttribute('sizeOriginal') > $maxFileSize) {
$maxFileSize = $file->getAttribute('sizeOriginal');