@@ -607,15 +607,15 @@ public function getAllStats(Request $request)
607
607
abort_unless ($ request ->user ()->is_admin === 1 , 404 );
608
608
609
609
if ($ request ->has ('refresh ' )) {
610
- Cache::forget ('admin-api:instance-all-stats_v1 ' );
610
+ Cache::forget ('admin-api:instance-all-stats-v1 ' );
611
611
}
612
612
613
613
return Cache::remember ('admin-api:instance-all-stats-v1 ' , 1209600 , function () {
614
- $ days = range (0 , 6 );
614
+ $ days = range (1 , 7 );
615
615
$ res = [
616
616
'cached_at ' => now ()->format ('c ' ),
617
617
];
618
- $ minStatusId = SnowflakeService::byDate (now ()->subDays (8 ));
618
+ $ minStatusId = SnowflakeService::byDate (now ()->subDays (7 ));
619
619
620
620
foreach ($ days as $ day ) {
621
621
$ label = now ()->subDays ($ day )->format ('D ' );
@@ -631,7 +631,7 @@ public function getAllStats(Request $request)
631
631
'date ' => now ()->subDays ($ day )->format ('M j Y ' ),
632
632
'label_full ' => $ label ,
633
633
'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 ()
635
635
];
636
636
637
637
$ res ['instances ' ]['days ' ][] = [
@@ -644,16 +644,16 @@ public function getAllStats(Request $request)
644
644
645
645
$ res ['users ' ]['total ' ] = DB ::table ('users ' )->count ();
646
646
$ 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 ' ); ;
649
649
$ res ['posts ' ]['total ' ] = DB ::table ('statuses ' )->whereNull ('uri ' )->count ();
650
650
$ res ['posts ' ]['min ' ] = collect ($ res ['posts ' ]['days ' ])->min ('count ' );
651
651
$ 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 ' ) ;
653
653
$ res ['instances ' ]['total ' ] = DB ::table ('instances ' )->count ();
654
654
$ res ['instances ' ]['min ' ] = collect ($ res ['instances ' ]['days ' ])->min ('count ' );
655
655
$ 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 ' ) ;
657
657
658
658
return $ res ;
659
659
});
0 commit comments