Merge pull request #1413 from AndyTWF/stand-predictor-departure-airfield

fix: arbitary stand predictor departure airfield
VATSIM-UK · Oct 10, 2023 · 752532c · 752532c
2 parents dfcda9b + b7dfecd
commit 752532c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/app/Http/Livewire/StandPredictorForm.php b/app/Http/Livewire/StandPredictorForm.php
@@ -4,6 +4,7 @@
 
 use App\Filament\Helpers\SelectOptions;
 use App\Models\Airfield\Airfield;
+use App\Rules\Airfield\AirfieldIcao;
 use App\Services\AirlineService;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Select;
@@ -42,11 +43,11 @@ public function getFormSchema(): array
                         ->options(SelectOptions::aircraftTypes())
                         ->required()
                         ->searchable(),
-                    Select::make('departureAirfield')
+                    TextInput::make('departureAirfield')
                         ->label('Departure Airfield')
-                        ->options(Airfield::all()->mapWithKeys(fn ($airfield) => [$airfield->code => $airfield->code]))
-                        ->required()
-                        ->searchable(),
+                        ->rule(new AirfieldIcao())
+                        ->alpha()
+                        ->required(),
                     Select::make('arrivalAirfield')
                         ->label('Arrival Airfield')
                         ->options(Airfield::all()->mapWithKeys(fn ($airfield) => [$airfield->code => $airfield->code]))
@@ -58,6 +59,9 @@ public function getFormSchema(): array
 
     public function submit(): void
     {
+        // Convert the callsign to uppercase before validating it.
+        $this->departureAirfield = strtoupper($this->departureAirfield);
+
         $this->form->validate();
         $this->emit('standPredictorFormSubmitted', [
             'callsign' => $this->callsign,

diff --git a/tests/app/Http/Livewire/StandPredictorFormTest.php b/tests/app/Http/Livewire/StandPredictorFormTest.php
@@ -32,6 +32,25 @@ public function testItSubmits()
             ]);
     }
 
+    public function testItSubmitsLowercaseDepartureAirfield()
+    {
+        Livewire::test(StandPredictorForm::class)
+            ->set('callsign', 'BAW999')
+            ->set('aircraftType', 1)
+            ->set('departureAirfield', 'egkk')
+            ->set('arrivalAirfield', 'EGLL')
+            ->call('submit')
+            ->assertHasNoErrors()
+            ->assertEmitted('standPredictorFormSubmitted', [
+                'callsign' => 'BAW999',
+                'cid' => 1203533,
+                'aircraft_id' => 1,
+                'airline_id' => 1,
+                'planned_depairport' => 'EGKK',
+                'planned_destairport' => 'EGLL',
+            ]);
+    }
+
     public function testItDoesntSubmitIfNoCallsign()
     {
         Livewire::test(StandPredictorForm::class)
@@ -64,6 +83,17 @@ public function testItDoesntSubmitIfNoDepartureAirfield()
             ->assertNotEmitted('standPredictorFormSubmitted');
     }
 
+    public function testItDoesntSubmitIfDepartureAirfieldNotIcao()
+    {
+        Livewire::test(StandPredictorForm::class)
+            ->set('callsign', 'BAW123')
+            ->set('arrivalAirfield', 'EGLL')
+            ->set('departureAirfield', '1234X')
+            ->call('submit')
+            ->assertHasErrors(['departureAirfield'])
+            ->assertNotEmitted('standPredictorFormSubmitted');
+    }
+
     public function testItDoesntSubmitIfNoArrivalAirfield()
     {
         Livewire::test(StandPredictorForm::class)