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

Flight/Subfleet fares not returning in API #899 (#900)

Browse Source 
Make sure proper fares are returned from the API #899
This commit is contained in:
Nabeel S
2020-10-24 15:11:08 -04:00
committed by GitHub
parent b83f7dcac8
commit 1be68d1e63
13 changed files with 206 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
tests/FinanceTest.php
View File

@@ -16,6 +16,7 @@ use App\Models\Subfleet;
use App\Models\User;
use App\Repositories\ExpenseRepository;
use App\Repositories\JournalRepository;
use App\Services\BidService;
use App\Services\FareService;
use App\Services\Finance\PirepFinanceService;
use App\Services\FleetService;
@@ -235,12 +236,130 @@ class FinanceTest extends TestCase
$this->assertEquals($fare->capacity, $subfleet_fares->get(0)->capacity);
}
/**
* Make sure that the API is returning the fares properly for a subfleet on a flight
* https://github.com/nabeelio/phpvms/issues/899
*/
public function testFlightFaresOverAPI()
{
$this->updateSetting('pireps.only_aircraft_at_dpt_airport', false);
$this->updateSetting('pireps.restrict_aircraft_to_rank', false);
$this->user = factory(User::class)->create();
/** @var Flight $flight */
$flight = factory(Flight::class)->create();
/** @var Subfleet $subfleet */
$subfleet = factory(Subfleet::class)->create();
$this->fleetSvc->addSubfleetToFlight($subfleet, $flight);
/** @var Fare $fare */
$fare = factory(Fare::class)->create();
$this->fareSvc->setForFlight($flight, $fare);
$flight_fares = $this->fareSvc->getForFlight($flight);
$this->assertCount(1, $flight_fares);
$this->assertEquals($fare->price, $flight_fares->get(0)->price);
$this->assertEquals($fare->capacity, $flight_fares->get(0)->capacity);
//
// set an override now (but on the flight)
//
$this->fareSvc->setForFlight($flight, $fare, ['price' => 50]);
$req = $this->get('/api/flights/'.$flight->id);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertEquals($flight->id, $body['id']);
$this->assertCount(1, $body['subfleets']);
$this->assertEquals(50, $body['fares'][0]['price']);
$this->assertEquals($fare->capacity, $body['fares'][0]['capacity']);
}
public function testFlightFaresOverAPIOnUserBids()
{
$this->updateSetting('pireps.only_aircraft_at_dpt_airport', false);
$this->updateSetting('pireps.restrict_aircraft_to_rank', false);
/** @var BidService $bidSvc */
$bidSvc = app(BidService::class);
$this->user = factory(User::class)->create();
/** @var Flight $flight */
$flight = factory(Flight::class)->create();
/** @var Subfleet $subfleet */
$subfleet = factory(Subfleet::class)->create();
$this->fleetSvc->addSubfleetToFlight($subfleet, $flight);
/** @var Fare $fare */
$fare = factory(Fare::class)->create();
$this->fareSvc->setForFlight($flight, $fare);
$flight_fares = $this->fareSvc->getForFlight($flight);
$this->assertCount(1, $flight_fares);
$this->assertEquals($fare->price, $flight_fares->get(0)->price);
$this->assertEquals($fare->capacity, $flight_fares->get(0)->capacity);
//
// set an override now (but on the flight)
//
$this->fareSvc->setForFlight($flight, $fare, ['price' => 50]);
$bid = $bidSvc->addBid($flight, $this->user);
$req = $this->get('/api/user/bids');
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertEquals($flight->id, $body[0]['flight_id']);
$this->assertCount(1, $body[0]['flight']['subfleets']);
$this->assertEquals(50, $body[0]['flight']['fares'][0]['price']);
$this->assertEquals($fare->capacity, $body[0]['flight']['fares'][0]['capacity']);
}
public function testSubfleetFaresOverAPI()
{
$this->updateSetting('pireps.only_aircraft_at_dpt_airport', false);
$this->updateSetting('pireps.restrict_aircraft_to_rank', false);
/**
* Add a user and flights
*/
$this->user = factory(User::class)->create();
$flight = $this->addFlight($this->user);
/** @var FareService $fare_svc */
$fare_svc = app(FareService::class);
/** @var \App\Models\Fare $fare */
$fare = factory(Fare::class)->create();
$fare_svc->setForSubfleet($flight->subfleets[0], $fare, ['price' => 50]);
// Get from API
$req = $this->get('/api/flights/'.$flight->id);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertEquals($flight->id, $body['id']);
$this->assertCount(1, $body['subfleets']);
$this->assertEquals(50, $body['subfleets'][0]['fares'][0]['price']);
$this->assertEquals($fare->capacity, $body['subfleets'][0]['fares'][0]['capacity']);
}
/**
* Assign percentage values and make sure they're valid
*/
public function testFlightFareOverrideAsPercent()
{
/** @var Flight $flight */
$flight = factory(Flight::class)->create();
/** @var \App\Models\Fare $fare */
$fare = factory(Fare::class)->create();
$percent_incr = '20%';