Fix offene-umfragen badge

Tschucki · Mar 7, 2024 · bd3ad09 · bd3ad09
1 parent 2138475
commit bd3ad09
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/app/Filament/Resources/PublicPollsResource/Pages/ListPublicPolls.php b/app/Filament/Resources/PublicPollsResource/Pages/ListPublicPolls.php
@@ -31,23 +31,18 @@ public function getTabs(): array
                     $query->where('participant_id', auth()->id());
                 })->where('closes_at', '>', now())->orderBy('closes_at', 'DESC');
             })->badge(function () {
-                $allPublicPolls = PublicPoll::where('visible_to_public', true)
-                    ->where('approved', true)
-                    ->where('in_review', false)
-                    ->where('closes_at', '>', now())
-                    ->withoutGlobalScope(SoftDeletingScope::class)
-                    ->count();
-
-                $allParticipatedPolls = PublicPoll::whereHas('participants', static function (Builder $query) {
-                    $query->where('user_id', \Auth::id());
+                $notParticipatedPolls = PublicPoll::whereDoesntHave('participants', static function (Builder $query) {
+                    $query->where('participant_id', \Auth::id());
                 })
+                    ->where('original_content_link', null)
                     ->where('visible_to_public', true)
                     ->where('approved', true)
                     ->where('in_review', false)
+                    ->where('closes_at', '>', now())
                     ->withoutGlobalScope(SoftDeletingScope::class)
-                    ->count();
+                    ->get();
 
-                return \Number::abbreviate($allPublicPolls - $allParticipatedPolls);
+                return \Number::abbreviate($notParticipatedPolls->count());
             }),
 
             'teilgenommen' => Tab::make('Teilgenommene Umfragen')->modifyQueryUsing(function (Builder $query) {