nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

user storage fix

Browse Source
This commit is contained in:
Čarodej
2022-03-28 11:38:05 +02:00
parent 6a48beb793
commit 5964bebad2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/App/Users/Resources/UserStorageResource.php
View File

@@ -129,15 +129,19 @@ class UserStorageResource extends JsonResource
$trafficRecords = DB::table('traffic')
->where('user_id', $this->id)
->where('created_at', '>', $period)
->orderBy('created_at')
->get(['upload', 'download', 'created_at'])
->each(fn ($record) => $record->created_at = format_date($record->created_at, 'd. M. Y'))
->keyBy('created_at');
->groupBy('date')
->get([
DB::raw('Date(created_at) as date'),
DB::raw('sum(download) as download'),
DB::raw('sum(upload) as upload'),
])
->each(fn ($record) => $record->date = format_date($record->date, 'd. M. Y'))
->keyBy('date');
$mappedTrafficRecords = mapTrafficRecords($trafficRecords);
$upload = $mappedTrafficRecords->map(fn ($record) => [
'created_at' => $record->created_at,
'created_at' => $record->date,
'amount' => Metric::bytes($record->upload)->format(),
'percentage' => intval($uploadMax) !== 0
? round(($record->upload / $uploadMax) * 100, 2)
@@ -145,7 +149,7 @@ class UserStorageResource extends JsonResource
]);
$download = $mappedTrafficRecords->map(fn ($record) => [
'created_at' => $record->created_at,
'created_at' => $record->date,
'amount' => Metric::bytes($record->download)->format(),
'percentage' => intval($downloadMax) !== 0
? round(($record->download / $downloadMax) * 100, 2)