include and order by calculated standardised score

Author: notbakaneko

app/Models/Contest.php

@@ -131,7 +131,7 @@ public function calculateScores(): void
 
     public function isBestOf(): bool
     {
-        return $this->getExtraOptions()['best_of'] ?? false;
+        return isset($this->getExtraOptions()['best_of']);
     }
 
     public function isJudge(User $user): bool
@@ -151,6 +151,11 @@ public function isJudgingActive(): bool
         return $this->isJudged() && $this->isVotingStarted() && !$this->show_votes;
     }
 
+    public function isScoreStandardised(): bool
+    {
+        return $this->getExtraOptions()['is_score_standardised'] ?? false;
+    }
+
     public function isSubmittedBeatmaps(): bool
     {
         return $this->isBestOf() || ($this->getExtraOptions()['submitted_beatmaps'] ?? false);
@@ -290,16 +295,12 @@ 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);
+            $options = $this->getExtraOptions();
 
             return Cache::remember(
                 "contest_entries_with_votes_{$this->id}",
                 300,
-                fn () => $query->with(['contest', ...$preloads])->withScore($option)->get()
+                fn () => $query->with(['contest', ...$preloads])->withScore($options)->get()
             );
         } elseif ($this->isBestOf()) {
             if ($user === null) {

app/Models/ContestEntry.php

@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
+
 /**
  * @property-read Contest $contest
  * @property int $contest_id
@@ -81,18 +82,26 @@ public function scopeForBestOf(Builder $query, User $user, string $ruleset, ?str
         return $query;
     }
 
-    public function scopeWithScore(Builder $query, string $option): Builder
+    public function scopeWithScore(Builder $query, array $options): Builder
     {
         $orderValue = 'votes_count';
 
-        if ($option === 'best_of') {
+        if (isset($options['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 ($option === 'judged') {
+        } else if ($options['judged'] ?? false) {
             $query->withSum('scores', 'value');
-            $orderValue = 'scores_sum_value';
+
+            if ($options['is_score_standardised'] ?? false) {
+                $scoreQuery = ContestJudgeVote::selectRaw(\DB::raw('SUM(`total_score_std`)'));
+                $scoreQuery->whereColumn($scoreQuery->qualifyColumn('contest_entry_id'), $this->qualifyColumn('id'));
+                $query->addSelect(['total_score_std' => $scoreQuery]);
+                $orderValue = 'total_score_std';
+            } else {
+                $orderValue = 'scores_sum_value';
+            }
         } else {
             $query->withCount('votes');
         }

app/Transformers/ContestEntryTransformer.php

@@ -67,7 +67,7 @@ public function includeResults(ContestEntry $entry)
 
         return $this->primitive([
             'actual_name' => $entry->name,
-            'score_std' => $judged ? $entry->totalScoreStd() : null,
+            'score_std' => $judged ? $entry->total_score_std : null,
             'votes' => (int) $votes, // TODO: change to score or something else, or even better stop overloading the results value.
         ]);
     }

app/Transformers/ContestJudgeVoteTransformer.php

@@ -41,7 +41,7 @@ public function includeTotalScore(ContestJudgeVote $judgeVote): Primitive
 
     public function includeTotalScoreStd(ContestJudgeVote $judgeVote): Primitive
     {
-        return $this->primitive($judgeVote->totalScoreStd());
+        return $this->primitive($judgeVote->total_score_std);
     }
 
     public function includeUser(ContestJudgeVote $judgeVote): Item