fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update AdminStatsService, fix postgres bug

Browse source
This commit is contained in:
Daniel Supernault 2021-05-25 01:36:13 -06:00
parent b971f07e8c
commit af71913597
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Services/AdminStatsService.php
View file

@ -67,10 +67,11 @@ class AdminStatsService
protected static function postsGraph() protected static function postsGraph()
{ {
$ttl = now()->addHours(12); $ttl = now()->addHours(12);
return Cache::remember('admin:dashboard:home:data-postsGraph:v0:24hr', $ttl, function() { return Cache::remember('admin:dashboard:home:data-postsGraph:v0.1:24hr', $ttl, function() {
$gb = config('database.default') == 'pgsql' ? ['statuses.id', DB::raw('Date(created_at)')] : DB::raw('Date(created_at)');
$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*') $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*')
->where('created_at', '>=', now()->subWeek()) ->where('created_at', '>=', now()->subWeek())
->groupBy(DB::raw('Date(created_at)')) ->groupBy($gb)
->orderBy('created_at', 'DESC') ->orderBy('created_at', 'DESC')
->pluck('count', 'date'); ->pluck('count', 'date');
@ -88,7 +89,7 @@ class AdminStatsService
$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*') $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*')
->where('created_at', '>=', now()->subWeeks(2)) ->where('created_at', '>=', now()->subWeeks(2))
->where('created_at', '<=', now()->subWeeks(1)) ->where('created_at', '<=', now()->subWeeks(1))
->groupBy(DB::raw('Date(created_at)')) ->groupBy($gb)
->orderBy('created_at', 'DESC') ->orderBy('created_at', 'DESC')
->pluck('count', 'date'); ->pluck('count', 'date');