Handle SVFR Squawks (#5)

VATSIM-UK · Jan 20, 2019 · a98f855 · a98f855
1 parent f177e08
commit a98f855
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/app/Http/Controllers/SquawkController.php b/app/Http/Controllers/SquawkController.php
@@ -161,7 +161,7 @@ public function assignLocalSquawk(Request $request, string $callsign) : JsonResp
             $request,
             [
                 'unit' => 'required|alpha',
-                'rules' => 'required|in:V,I',
+                'rules' => 'required|in:V,I,S',
             ]
         );
 

diff --git a/app/Services/SquawkService.php b/app/Services/SquawkService.php
@@ -22,7 +22,7 @@
 class SquawkService
 {
     /**
-     * Constant deemed to mean Any Flight Rules
+     * Constant deemed to mean Any Flight Rules.
      *
      * @var String
      */
@@ -103,6 +103,10 @@ public function assignLocalSquawk(string $callsign, string $unit, string $rules)
             throw new InvalidArgumentException('Unit not found');
         }
 
+        if ($rules === 'S') {
+            $rules = 'V';
+        }
+
         $allRanges = $unit->ranges;
         $ruleSpecificRanges = $allRanges->where('rules', $rules)->shuffle();
         $rangesToUse = ($ruleSpecificRanges->isNotEmpty())

diff --git a/tests/app/Services/SquawkServiceTest.php b/tests/app/Services/SquawkServiceTest.php
@@ -207,6 +207,11 @@ public function testItAssignsFlightRuleSpecificLocalSquawks()
         $this->assertSame('3762', $this->squawkService->assignLocalSquawk('BAW9AZ', 'EGKA', 'I')->squawk());
     }
 
+    public function testLocalSquawksTreatsSvfrAsVfr()
+    {
+        $this->assertSame('3763', $this->squawkService->assignLocalSquawk('BAW9AZ', 'EGKA', 'S')->squawk());
+    }
+
     public function testItAuditsWhoAssignsLocalSquawks()
     {
         $this->squawkService->assignLocalSquawk('BAW9AZ', 'EGKA', 'I');