pass flag into scope instead of Contest

Author: notbakaneko

app/Models/Contest.php

@@ -131,7 +131,7 @@ public function calculateScores(): void
 
     public function isBestOf(): bool
     {
-        return isset($this->getExtraOptions()['best_of']);
+        return $this->getExtraOptions()['best_of'] ?? false;
     }
 
     public function isJudge(User $user): bool
@@ -290,10 +290,16 @@ public function entriesByType(?User $user, array $preloads = [])
         $query = $this->entries()->with(['contest', ...$preloads]);
 
         if ($this->show_votes) {
+            $option = $this->isBestOf()
+                ? 'best_of'
+                : ($this->isJudged()
+                    ? 'judged'
+                    : null);
+
             return Cache::remember(
                 "contest_entries_with_votes_{$this->id}",
                 300,
-                fn () => $query->with(['contest', ...$preloads])->withScore($this)->get()
+                fn () => $query->with(['contest', ...$preloads])->withScore($option)->get()
             );
         } elseif ($this->isBestOf()) {
             if ($user === null) {

app/Models/ContestEntry.php

@@ -81,16 +81,16 @@ public function scopeForBestOf(Builder $query, User $user, string $ruleset, ?str
         return $query;
     }
 
-    public function scopeWithScore(Builder $query, Contest $contest): Builder
+    public function scopeWithScore(Builder $query, string $option): Builder
     {
         $orderValue = 'votes_count';
 
-        if ($contest->isBestOf()) {
+        if ($option === 'best_of') {
             $query
                 ->selectRaw('*')
                 ->selectRaw('(SELECT FLOOR(SUM(`weight`)) FROM `contest_votes` WHERE `contest_entries`.`id` = `contest_votes`.`contest_entry_id`) AS votes_count')
                 ->limit(50); // best of contests tend to have a _lot_ of entries...
-        } else if ($contest->isJudged()) {
+        } else if ($option === 'judged') {
             $query->withSum('scores', 'value');
             $orderValue = 'scores_sum_value';
         } else {