Skip to content

Commit 5c5541f

Browse files
committed
Update AdminApiController
1 parent a6d10f0 commit 5c5541f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

app/Http/Controllers/Api/AdminApiController.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -607,15 +607,15 @@ public function getAllStats(Request $request)
607607
abort_unless($request->user()->is_admin === 1, 404);
608608

609609
if($request->has('refresh')) {
610-
Cache::forget('admin-api:instance-all-stats_v1');
610+
Cache::forget('admin-api:instance-all-stats-v1');
611611
}
612612

613613
return Cache::remember('admin-api:instance-all-stats-v1', 1209600, function() {
614-
$days = range(0, 6);
614+
$days = range(1, 7);
615615
$res = [
616616
'cached_at' => now()->format('c'),
617617
];
618-
$minStatusId = SnowflakeService::byDate(now()->subDays(8));
618+
$minStatusId = SnowflakeService::byDate(now()->subDays(7));
619619

620620
foreach($days as $day) {
621621
$label = now()->subDays($day)->format('D');
@@ -631,7 +631,7 @@ public function getAllStats(Request $request)
631631
'date' => now()->subDays($day)->format('M j Y'),
632632
'label_full' => $label,
633633
'label' => $labelShort,
634-
'count' => Status::where('id', '>', $minStatusId)->whereNull('uri')->whereDate('created_at', now()->subDays($day))->count()
634+
'count' => Status::whereNull('uri')->where('id', '>', $minStatusId)->whereDate('created_at', now()->subDays($day))->count()
635635
];
636636

637637
$res['instances']['days'][] = [
@@ -644,16 +644,16 @@ public function getAllStats(Request $request)
644644

645645
$res['users']['total'] = DB::table('users')->count();
646646
$res['users']['min'] = collect($res['users']['days'])->min('count');
647-
$res['users']['max'] = $res['users']['total'];
648-
$res['users']['change'] = $res['users']['total'] - $res['users']['min'];
647+
$res['users']['max'] = collect($res['users']['days'])->max('count');
648+
$res['users']['change'] = collect($res['users']['days'])->sum('count');;
649649
$res['posts']['total'] = DB::table('statuses')->whereNull('uri')->count();
650650
$res['posts']['min'] = collect($res['posts']['days'])->min('count');
651651
$res['posts']['max'] = collect($res['posts']['days'])->max('count');
652-
$res['posts']['change'] = $res['posts']['total'] - $res['posts']['min'];
652+
$res['posts']['change'] = collect($res['posts']['days'])->sum('count');
653653
$res['instances']['total'] = DB::table('instances')->count();
654654
$res['instances']['min'] = collect($res['instances']['days'])->min('count');
655655
$res['instances']['max'] = collect($res['instances']['days'])->max('count');
656-
$res['instances']['change'] = $res['instances']['total'] - $res['instances']['min'];
656+
$res['instances']['change'] = collect($res['instances']['days'])->sum('count');
657657

658658
return $res;
659659
});

0 commit comments

Comments
 (0)