From 026f2002e5a58b06056bb9324a67ea934eb107f9 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Sat, 13 Jul 2024 23:28:02 -0500 Subject: [PATCH] SeatingStatus updates to limit entries --- .../Tabulation/SeatingStatusController.php | 10 +++++++++- tests/Feature/Pages/Seating/statusTest.php | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Tabulation/SeatingStatusController.php b/app/Http/Controllers/Tabulation/SeatingStatusController.php index 63465dd..dd8f6f8 100644 --- a/app/Http/Controllers/Tabulation/SeatingStatusController.php +++ b/app/Http/Controllers/Tabulation/SeatingStatusController.php @@ -13,7 +13,15 @@ class SeatingStatusController extends Controller */ public function __invoke(Request $request) { - $auditions = Audition::forSeating()->withCount(['entries', 'unscoredEntries'])->with('flags')->get(); + $auditions = Audition::forSeating() + ->withCount(['entries'=> function ($query) { + $query->where('for_seating', 1); + }]) + ->withCount(['unscoredEntries'=>function ($query) { + $query->where('for_seating', 1); + }]) + ->with('flags') + ->get(); $auditionData = []; foreach ($auditions as $audition) { $auditionData[$audition->id] = [ diff --git a/tests/Feature/Pages/Seating/statusTest.php b/tests/Feature/Pages/Seating/statusTest.php index a05a09a..686da05 100644 --- a/tests/Feature/Pages/Seating/statusTest.php +++ b/tests/Feature/Pages/Seating/statusTest.php @@ -145,5 +145,18 @@ it('correctly shows a flag when the audition is flagged as seated', function () $response->assertViewHas('auditionData', function ($viewAuditionData) use ($audition) { return $viewAuditionData[$audition->id]['seatsPublished'] === true; }); - +}); +it('shows seating auditions', function() { + $audition = Audition::factory()->create(); + actAsAdmin(); + get(route('seating.status')) + ->assertOk() + ->assertSee($audition->name); +}); +it('does not show advancement only auditions', function() { + $audition = Audition::factory()->advancementOnly()->create(); + actAsAdmin(); + get(route('seating.status')) + ->assertOk() + ->assertDontSee($audition->name); });