FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7.0.0-beta3 Release (#541)

Browse Source 
* 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)
This commit is contained in:
Nabeel S
2020-02-08 13:29:34 -05:00
committed by GitHub
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/AcarsTest.php
View File

@@ -92,6 +92,38 @@ class AcarsTest extends TestCase
$response->assertStatus(400);
}
public function testBlankAirport()
{
$this->user = factory(App\Models\User::class)->create();
$airline = factory(App\Models\Airline::class)->create();
$aircraft = factory(App\Models\Aircraft::class)->create();
/**
* INVALID AIRLINE_ID FIELD
*/
$uri = '/api/pireps/prefile';
$pirep = [
'airline_id' => $airline->id,
'aircraft_id' => $aircraft->id,
'dpt_airport_id' => null,
'arr_airport_id' => null,
'flight_number' => '6000',
'level' => 38000,
'planned_flight_time' => 120,
'source_name' => 'ACARSTESTS',
'route' => 'POINTA POINTB',
];
$response = $this->post($uri, $pirep);
$response->assertStatus(400);
$this->assertEquals(
'A departure airport is required, An arrival airport is required',
$response->json('details')
);
}
/**
* Make sure an error is thrown if the pilot is not at the current airport
*/
@@ -273,6 +305,52 @@ class AcarsTest extends TestCase
$this->assertEquals($body['state'], PirepState::CANCELLED);
}
public function testPrefileAndInvalidUpdates()
{
$subfleet = $this->createSubfleetWithAircraft(2);
$rank = $this->createRank(10, [$subfleet['subfleet']->id]);
$this->user = factory(App\Models\User::class)->create([
'rank_id' => $rank->id,
]);
$airport = factory(App\Models\Airport::class)->create();
$airline = factory(App\Models\Airline::class)->create();
$aircraft = $subfleet['aircraft']->random();
$uri = '/api/pireps/prefile';
$pirep = [
'airline_id' => $airline->id,
'aircraft_id' => $aircraft->id,
'dpt_airport_id' => $airport->icao,
'arr_airport_id' => $airport->icao,
'flight_number' => '6000',
'level' => 38000,
'planned_distance' => 400,
'planned_flight_time' => 120,
'route' => 'POINTA POINTB',
'source_name' => 'UnitTest',
];
$response = $this->post($uri, $pirep);
$response->assertStatus(201);
$pirep = $response->json('data');
/**
* Try to update fields
*/
$uri = '/api/pireps/'.$pirep['id'].'/update';
$update = [
'dpt_airport_id' => '',
];
$response = $this->post($uri, $update);
$response->assertStatus(400);
$detail = $response->json('details');
$this->assertEquals('A departure airport is required', $detail);
}
/**
* Post a PIREP into a PREFILE state and post ACARS
*/

2
tests/AwardsTest.php
View File

@@ -34,7 +34,7 @@ class AwardsTest extends TestCase
{
// Create one award that's given out with one flight
$award = factory(App\Models\Award::class)->create([
'ref_model' => App\Awards\PilotFlightAwards::class,
'ref_model' => Modules\Awards\Awards\PilotFlightAwards::class,
'ref_model_params' => 1,
]);

2
tests/FinanceTest.php
View File

@@ -177,7 +177,7 @@ class FinanceTest extends TestCase
'capacity' => $percent_200,
]);
$ac_fares = $this->fareSvc->getForFlight($flight);
$ac_fares = $this->fareSvc->getAllFares($flight, null);
$this->assertCount(1, $ac_fares);
$this->assertEquals($new_price, $ac_fares[0]->price);

98
tests/FlightTest.php
View File

@@ -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;

29
tests/ImporterTest.php
View File

@@ -3,6 +3,7 @@
use App\Contracts\ImportExport;
use App\Models\Aircraft;
use App\Models\Airport;
use App\Models\Enums\AircraftStatus;
use App\Models\Enums\Days;
use App\Models\Enums\ExpenseType;
use App\Models\Enums\FlightType;
@@ -19,9 +20,6 @@ use App\Services\ImportExport\FlightExporter;
use App\Services\ImportService;
use Illuminate\Validation\ValidationException;
/**
* Class ImporterTest
*/
class ImporterTest extends TestCase
{
private $importBaseClass;
@@ -470,7 +468,7 @@ class ImporterTest extends TestCase
$file_path = base_path('tests/data/flights.csv');
$status = $this->importSvc->importFlights($file_path);
$this->assertCount(1, $status['success']);
$this->assertCount(2, $status['success']);
$this->assertCount(1, $status['errors']);
// See if it imported
@@ -566,7 +564,8 @@ class ImporterTest extends TestCase
*/
public function testAircraftImporter(): void
{
$subfleet = factory(App\Models\Subfleet::class)->create(['type' => 'A32X']);
factory(App\Models\Airline::class)->create();
// $subfleet = factory(App\Models\Subfleet::class)->create(['type' => 'A32X']);
$file_path = base_path('tests/data/aircraft.csv');
$status = $this->importSvc->importAircraft($file_path);
@@ -581,12 +580,26 @@ class ImporterTest extends TestCase
$this->assertNotNull($aircraft);
$this->assertNotNull($aircraft->hex_code);
$this->assertEquals($subfleet->id, $aircraft->id);
$this->assertEquals($subfleet->type, $aircraft->subfleet->type);
$this->assertNotNull($aircraft->subfleet);
$this->assertNotNull($aircraft->subfleet->airline);
$this->assertEquals('A32X', $aircraft->subfleet->type);
$this->assertEquals('A320-211', $aircraft->name);
$this->assertEquals('N309US', $aircraft->registration);
$this->assertEquals(null, $aircraft->zfw);
$this->assertEquals('A', $aircraft->status);
$this->assertEquals(AircraftStatus::ACTIVE, $aircraft->status);
// Now try importing the updated file, the status for the aircraft should change
// to being stored
$file_path = base_path('tests/data/aircraft-update.csv');
$status = $this->importSvc->importAircraft($file_path);
$this->assertCount(1, $status['success']);
$aircraft = Aircraft::where([
'registration' => 'N309US',
])->first();
$this->assertEquals(AircraftStatus::STORED, $aircraft->status);
}
/**

2
tests/MetarTest.php
View File

@@ -112,7 +112,7 @@ class MetarTest extends TestCase
$this->assertEquals(1000, $parsed['clouds'][0]['height']['ft']);
$this->assertEquals(1600, $parsed['clouds'][1]['height']['ft']);
$this->assertEquals(4000, $parsed['clouds'][2]['height']['ft']);
$this->assertNull($parsed['clouds'][3]['height']['ft']);
$this->assertNull($parsed['clouds'][3]['height']);
}
public function testMetar3()

6
tests/PIREPTest.php
View File

@@ -6,11 +6,13 @@ use App\Models\Enums\AcarsType;
use App\Models\Enums\PirepState;
use App\Models\Pirep;
use App\Models\User;
use App\Notifications\Messages\PirepAccepted;
use App\Repositories\SettingRepository;
use App\Services\BidService;
use App\Services\FlightService;
use App\Services\PirepService;
use Carbon\Carbon;
use Illuminate\Support\Facades\Notification;
class PIREPTest extends TestCase
{
@@ -81,7 +83,6 @@ class PIREPTest extends TestCase
* Now set the PIREP state to ACCEPTED
*/
$new_pirep_count = $pirep->pilot->flights + 1;
$original_flight_time = $pirep->pilot->flight_time;
$new_flight_time = $pirep->pilot->flight_time + $pirep->flight_time;
$this->pirepSvc->changeState($pirep, PirepState::ACCEPTED);
@@ -96,6 +97,9 @@ class PIREPTest extends TestCase
$this->get('/api/fleet/aircraft/'.$pirep->aircraft_id, [], $user)
->assertJson(['data' => ['airport_id' => $pirep->arr_airport_id]]);
// Make sure a notification was sent out to both the user and the admin(s)
Notification::assertSentTo([$user], PirepAccepted::class);
// Try cancelling it
$uri = '/api/pireps/'.$pirep->id.'/cancel';
$response = $this->put($uri, [], [], $user);

8
tests/TestCase.php
View File

@@ -8,7 +8,7 @@ use GuzzleHttp\HandlerStack;
use GuzzleHttp\Psr7\Response;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Notification;
use Tests\CreatesApplication;
use Tests\TestData;
@@ -37,7 +37,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
/**
* @throws Exception
*/
public function setUp() : void
public function setUp(): void
{
parent::setUp();
@@ -46,13 +46,13 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
ThrottleRequests::class
);
Mail::fake();
Notification::fake();
Artisan::call('database:create', ['--reset' => true]);
Artisan::call('migrate:refresh', ['--env' => 'testing']);
}
public function tearDown() : void
public function tearDown(): void
{
parent::tearDown();
}

18
tests/UtilsTest.php
View File

@@ -69,4 +69,22 @@ class UtilsTest extends TestCase
$hex_code = \App\Support\ICAO::createHexCode();
$this->assertNotNull($hex_code);
}
public function testGetDomain()
{
$tests = [
'http://phpvms.net',
'https://phpvms.net',
'phpvms.net',
'https://phpvms.net/index.php',
'https://demo.phpvms.net',
'https://demo.phpvms.net/file/index.php',
];
foreach ($tests as $case) {
$this->assertEquals('phpvms.net', \App\Support\Utils::getRootDomain($case));
}
$this->assertEquals('phpvms', \App\Support\Utils::getRootDomain('http://phpvms'));
}
}

21
tests/VersionTest.php
View File

@@ -20,15 +20,24 @@ class VersionTest extends TestCase
public function testGreaterThanVersionStrings(): void
{
$test = [
'7.0.0' => '6.0.0',
'7.0.0-beta' => '7.0.0-alpha',
'7.0.0-beta.1' => '7.0.0-beta',
'7.0.0-beta.2' => '7.0.0-beta.1',
['7.0.0' => '6.0.0'],
['7.0.0+1231s' => '6.0.0'],
// ['7.0.0-beta' => '7.0.0-dev'],
['7.0.0-beta' => '7.0.0-alpha'],
['7.0.0-beta.1' => '7.0.0-beta'],
['7.0.0-beta.2' => '7.0.0-beta.1'],
['7.0.0-beta.2+a34sdf' => '7.0.0-beta.1'],
];
$versionSvc = app(VersionService::class);
foreach ($test as $newVersion => $currentVersion) {
$this->assertTrue($versionSvc->isGreaterThan($newVersion, $currentVersion));
foreach ($test as $set) {
$newVersion = array_key_first($set);
$currentVersion = $set[$newVersion];
$this->assertTrue(
$versionSvc->isGreaterThan($newVersion, $currentVersion),
"{$newVersion} not greater than ${currentVersion}"
);
}
}

3
tests/data/aircraft-update.csv Normal file
View File

@@ -0,0 +1,3 @@
subfleet,iata, icao, name,registration,hex_code,zfw,status
A32X,A320,320,A320-211,N309US,,,S
74X,747 400, ,,
1 subfleet,iata, icao, name,registration,hex_code,zfw,status
2 A32X,A320,320,A320-211,N309US,,,S
3 74X,747 400, ,,

1
tests/data/flights.csv
View File

@@ -1,3 +1,4 @@
airline,flight_number,route_code,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,route,notes,active,subfleets,fares,fields
VMS,1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
" ",1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
VMS,113,,,KJFK,KAUS,KDFW,15,0810 EST,1035 CST,350,,207,J,,"Empty distance",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=C41;Arrival Gate=2
1 airline flight_number route_code route_leg dpt_airport arr_airport alt_airport days dpt_time arr_time level distance flight_time flight_type route notes active subfleets fares fields
2 VMS 1972 KAUS KJFK KLGA 15 0810 CST 1235 EST 350 1477 207 J ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6 Just a flight 1 A32X Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B? Departure Gate=4;Arrival Gate=C41
3 1972 KAUS KJFK KLGA 15 0810 CST 1235 EST 350 1477 207 J ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6 Just a flight 1 A32X Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B? Departure Gate=4;Arrival Gate=C41
4 VMS 113 KJFK KAUS KDFW 15 0810 EST 1035 CST 350 207 J Empty distance 1 A32X Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B? Departure Gate=C41;Arrival Gate=2