7.0.0-beta3 Release (#541)

* 391 Notification refactorings (#441) * Refactor notifications to allow easier plugins * Notification refactoring * Formatting * Move news to NewsService; cleanup of events * More refactoring; added send email out for news item and the template * Formatting * Formatting * Fix missing newsRepo (#445) * Refactor and add importer to Installer module #443 (#444) * Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting * Replace importer with AJAX powered; better error handling #443 (#447) * Replace importer with AJAX powered; better error handling #443 * Formatting * Fix command line importer * Remove bootstrap cache (#448) * Cleanup the bootstrap/cache directory when packaging * Fix removal of bootstrap cache * Formatting * Stricter checks on ACARS API data (#451) * Stricter checks on ACARS API data * More checks * Fix for flight_number check forcing to exist * Allow nullable on flight_id * Avoid proc_open use #455 (#456) * Use PhpExecutableFinder() closes #457 #458 (#460) * Use DateTimeZone instead of int for creating datetime closes #461 * Fix CSV imports giving Storage class not found #454 (#462) * Fix CSV imports giving Storage class not found #454 * Update yarn files for security alert * Add PHP 7.4 support (#464) * Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier * Fix BindingResolutionError when debug toolbar isn't present (#465) * Fix BindingResolutionError when debug toolbar isn't present * Formatting * Split the importer module out from the installer module (#468) * Split the importer module out from the installer module * Cleanup of unused imports * Move updater into separate module #453 * Remove unused imports/formatting * Disable the install and importer modules at the end of the setup * Unused imports; update IJ style * test explicit stage for php+mysql * add more to matrix * Add different MariaDB versions * undo * Cleanup Model doc * Pilots cannot use the dashboard or flights without admin rights (#481) * Use auth middleware instead of specific groups for logged in state * Auth check for admin access * Check user admin access for updates * Formatting * Allow nullable field and calculate distance if nulled for flight import #478 (#482) * Check for no roles being attached #480 (#483) * Return the flight fares if there are no subfleet fares #488 (#489) * Return the flight fares if there are no subfleet fares #488 * Formatting * Formatting * Account for units when entering fuel amounts #493 * Search for ICAO not working properly (#496) * /flights and /flights/search direct to the same endpoint * Properly set the distance/planned_distance on save (#497) * 491 Installation Error (#495) * Disable CSRF token * Add error handling around looking up the theme and set a default * Note about logs in issue template * Formatting * Fix GeoService errors when viewing PIREP #498 (#499) * Add new command to export a specific PIREP for debugging (#501) * Set a default model value for airports on PIREP (#500) * Set a default model value for airports on PIREP * Fix airport icao reference * Default airport models * Catch broader exception writing out config files #491 * style * Add reference to docs on doc site (#502) * Properly create/update rows importing #486 (#503) * Add base Dockerfile for Dockerhub builds (#504) * New subfleet not being attached to an airline on import #479 (#505) * Fix subfleet not being attached to an airline on creation in import #479 * Call airline name with optional() around subfleet * Minor cleanup * Search flights by subfleet #484 (#506) * API level search of flights #484 * Add Subfleet to flights page for search * Make the fuel used optional (#512) * Add make to Docker container * Add getRootDomain() to Utils (#514) * Show admin dropdown for admin-access ability (#515) * Show admin dropdown for admin-access ability closes #509 * Formatting * Check user permissions on the routes #508 (#516) * Check user permissions on the routes #508 * Formatting * Return default value on exception for setting() * Correct text for no subfleets #507 (#518) * Add a public_url() helper #513 (#519) * Reduce number of queries for update check (#520) * Try to clear caches before updating (#522) * Try to clear caches before updating * Add clear-compiled to maintenance cache list * Formatting * Set PIREPs page to public (#526) Set PIREPs page to public * Fix live and route map errors #527 (#528) * Add menu bar for mobile (#529) * Format all blade templates to 2 spaces #530 (#531) * Fix PIREP edit endpoint closes #533 (#534) * Fix import during flight cron #532 (#535) * PIREPS resource except for show (#536) * Use optional() around the airport fields (#537) * Use optional() around the airport fields * Add null-coalesce around full_name * Add link to download ACARS config from profile (#539) * Add link to download ACARS config from profile * Formatting * Update xml config file template (#540)
2020-02-08 13:29:34 -05:00
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
--- a/tests/FlightTest.php
+++ b/tests/FlightTest.php
@@ -1,6 +1,9 @@
 <?php

+use App\Cron\Nightly\SetActiveFlights;
+use App\Events\CronNightly;
 use App\Models\Enums\Days;
+use App\Models\Enums\NavaidType;
 use App\Models\Flight;
 use App\Models\User;
 use App\Repositories\SettingRepository;
@@ -21,6 +24,13 @@ class FlightTest extends TestCase
        $this->settingsRepo = app(SettingRepository::class);
    }

+    /**
+     * Add a single flight
+     *
+     * @param $user
+     *
+     * @return mixed
+     */
    public function addFlight($user)
    {
        $flight = factory(App\Models\Flight::class)->create([
@@ -36,6 +46,25 @@ class FlightTest extends TestCase
        return $flight;
    }

+    /**
+     * Add a given number of flights for a subfleet
+     *
+     * @param $subfleet
+     * @param $num_flights
+     *
+     * @return \App\Models\Flight[]
+     */
+    public function addFlightsForSubfleet($subfleet, $num_flights)
+    {
+        return factory(App\Models\Flight::class, $num_flights)->create([
+            'airline_id' => $subfleet->airline->id,
+        ])->each(function (Flight $f) use ($subfleet) {
+            $f->subfleets()->syncWithoutDetaching([
+                $subfleet->id,
+            ]);
+        });
+    }
+
    /**
     * Test adding a flight and also if there are duplicates
     */
@@ -148,10 +177,7 @@ class FlightTest extends TestCase
        $this->assertEquals($first_point['id'], $route[0]->id);
        $this->assertEquals($first_point['name'], $route[0]->name);
        $this->assertEquals($first_point['type']['type'], $route[0]->type);
-        $this->assertEquals(
-            $first_point['type']['name'],
-            \App\Models\Enums\NavaidType::label($route[0]->type)
-        );
+        $this->assertEquals($first_point['type']['name'], NavaidType::label($route[0]->type));
    }

    /**
@@ -173,6 +199,38 @@ class FlightTest extends TestCase
        $res->assertJsonCount(5, 'data');
    }

+    /**
+     * Search for flights based on a subfleet. If subfleet is blank
+     */
+    public function testSearchFlightBySubfleet()
+    {
+        $airline = factory(App\Models\Airline::class)->create();
+        $subfleetA = factory(App\Models\Subfleet::class)->create(['airline_id' => $airline->id]);
+        $subfleetB = factory(App\Models\Subfleet::class)->create(['airline_id' => $airline->id]);
+
+        $rank = $this->createRank(0, [$subfleetB->id]);
+        $this->user = factory(App\Models\User::class)->create([
+            'airline_id' => $airline->id,
+            'rank_id'    => $rank->id,
+        ]);
+
+        $this->addFlightsForSubfleet($subfleetA, 5);
+        $this->addFlightsForSubfleet($subfleetB, 10);
+
+        // search specifically for a given subfleet
+        //$query = 'subfleet_id='.$subfleetB->id;
+        $query = 'subfleet_id='.$subfleetB->id;
+        $res = $this->get('/api/flights/search?'.$query);
+        $res->assertStatus(200);
+        $res->assertJsonCount(10, 'data');
+
+        $body = $res->json('data');
+        collect($body)->each(function ($flight) use ($subfleetB) {
+            self::assertNotEmpty($flight['subfleets']);
+            self::assertEquals($subfleetB->id, $flight['subfleets'][0]['id']);
+        });
+    }
+
    /**
     * Test the bitmasks that they work for setting the day of week and
     * then retrieving by searching on those
@@ -227,8 +285,8 @@ class FlightTest extends TestCase
        ]);

        // Run the event that will enable/disable flights
-        $event = new \App\Events\CronNightly();
-        (new \App\Cron\Nightly\SetActiveFlights())->handle($event);
+        $event = new CronNightly();
+        (new SetActiveFlights())->handle($event);

        $res = $this->get('/api/flights');
        $body = $res->json('data');
@@ -274,8 +332,8 @@ class FlightTest extends TestCase
        ]);

        // Run the event that will enable/disable flights
-        $event = new \App\Events\CronNightly();
-        (new \App\Cron\Nightly\SetActiveFlights())->handle($event);
+        $event = new CronNightly();
+        (new SetActiveFlights())->handle($event);

        $res = $this->get('/api/flights');
        $body = $res->json('data');
@@ -313,8 +371,8 @@ class FlightTest extends TestCase
        ]);

        // Run the event that will enable/disable flights
-        $event = new \App\Events\CronNightly();
-        (new \App\Cron\Nightly\SetActiveFlights())->handle($event);
+        $event = new CronNightly();
+        (new SetActiveFlights())->handle($event);

        $res = $this->get('/api/flights');
        $body = $res->json('data');
@@ -342,6 +400,26 @@ class FlightTest extends TestCase
        $this->assertEquals($flight->id, $body['data'][0]['id']);
    }

+    public function testFlightSearchApiDepartureAirport()
+    {
+        $this->user = factory(App\Models\User::class)->create();
+        factory(App\Models\Flight::class, 10)->create([
+            'airline_id' => $this->user->airline_id,
+        ]);
+
+        $flight = factory(App\Models\Flight::class)->create([
+            'airline_id'     => $this->user->airline_id,
+            'dpt_airport_id' => 'KAUS',
+        ]);
+
+        $query = 'dpt_airport_id=kaus';
+        $req = $this->get('/api/flights/search?'.$query);
+        $body = $req->json();
+
+        $this->assertCount(1, $body['data']);
+        $this->assertEquals($flight->id, $body['data'][0]['id']);
+    }
+
    public function testFlightSearchApiDistance()
    {
        $total_flights = 10;