diff --git a/app/Actions/Tabulation/RankAuditionEntries.php b/app/Actions/Tabulation/RankAuditionEntries.php index 0984cf4..f6f19a9 100644 --- a/app/Actions/Tabulation/RankAuditionEntries.php +++ b/app/Actions/Tabulation/RankAuditionEntries.php @@ -24,7 +24,7 @@ class RankAuditionEntries * * @throws AuditionAdminException */ - public function __invoke(Audition $audition, string $rank_type) + public function __invoke(Audition $audition, string $rank_type): Collection|Entry { if ($rank_type !== 'seating' && $rank_type !== 'advancement') { throw new AuditionAdminException('Invalid rank type: '.$rank_type.' (must be seating or advancement)'); @@ -38,15 +38,13 @@ class RankAuditionEntries }); } - if ($rank_type === 'advancement') { - return cache()->remember('rank_advancement_'.$audition->id, $cache_duration, function () use ($audition) { - return $this->get_advancement_ranks($audition); - }); - } + return cache()->remember('rank_advancement_'.$audition->id, $cache_duration, function () use ($audition) { + return $this->get_advancement_ranks($audition); + }); } - private function get_seating_ranks(Audition $audition): Collection + private function get_seating_ranks(Audition $audition): Collection|Entry { if ($audition->bonusScore()->count() > 0) { $totalColumn = 'seating_total_with_bonus'; @@ -87,7 +85,7 @@ class RankAuditionEntries return $sortedEntries; } - private function get_advancement_ranks(Audition $audition): Collection + private function get_advancement_ranks(Audition $audition): Collection|Entry { return $audition->entries() ->whereHas('totalScore')