matt
/
auditionadmin
1
0
Fork 0
Code Issues 16 Pull Requests Packages Projects Releases Wiki Activity

Define return types in RankAuditionEntries action.

This commit is contained in:
Matt Young 2025-06-30 18:04:46 -05:00
parent 115bd9b320
commit 3a1b03a6c7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Actions/Tabulation/RankAuditionEntries.php
View File

@ -24,7 +24,7 @@ class RankAuditionEntries
* *
* @throws AuditionAdminException * @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') { if ($rank_type !== 'seating' && $rank_type !== 'advancement') {
throw new AuditionAdminException('Invalid rank type: '.$rank_type.' (must be seating or 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 cache()->remember('rank_advancement_'.$audition->id, $cache_duration, function () use ($audition) { return $this->get_advancement_ranks($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) { if ($audition->bonusScore()->count() > 0) {
$totalColumn = 'seating_total_with_bonus'; $totalColumn = 'seating_total_with_bonus';
@ -87,7 +85,7 @@ class RankAuditionEntries
return $sortedEntries; return $sortedEntries;
} }
private function get_advancement_ranks(Audition $audition): Collection private function get_advancement_ranks(Audition $audition): Collection|Entry
{ {
return $audition->entries() return $audition->entries()
->whereHas('totalScore') ->whereHas('totalScore')