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

#406 Refactor bids (#432)

Browse Source 
* Add flight_id column to pireps table

* Refactor PIREPs and bids closes 406

* Formatting
This commit is contained in:
Nabeel S
2019-11-05 11:44:31 -05:00
committed by GitHub
parent db087d0ccb
commit f5183babf6
35 changed files with 967 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
tests/BidTest.php Normal file
View File

@@ -0,0 +1,212 @@
<?php
use App\Models\Bid;
use App\Models\Flight;
use App\Models\User;
use App\Repositories\SettingRepository;
use App\Services\BidService;
use App\Services\FlightService;
class BidTest extends TestCase
{
protected $bidSvc;
protected $flightSvc;
protected $settingsRepo;
public function setUp(): void
{
parent::setUp();
$this->addData('base');
$this->bidSvc = app(BidService::class);
$this->flightSvc = app(FlightService::class);
$this->settingsRepo = app(SettingRepository::class);
}
public function addFlight($user)
{
$flight = factory(App\Models\Flight::class)->create([
'airline_id' => $user->airline_id,
]);
$flight->subfleets()->syncWithoutDetaching([
factory(App\Models\Subfleet::class)->create([
'airline_id' => $user->airline_id,
])->id,
]);
return $flight;
}
/**
* Add/remove a bid, test the API, etc
*
* @throws \App\Services\Exception
*/
public function testBids()
{
$this->settingsRepo->store('bids.allow_multiple_bids', true);
$this->settingsRepo->store('bids.disable_flight_on_bid', false);
$user = factory(User::class)->create();
$user2 = factory(User::class)->create();
$headers = $this->headers($user);
$flight = $this->addFlight($user);
$bid = $this->bidSvc->addBid($flight, $user);
$this->assertEquals($user->id, $bid->user_id);
$this->assertEquals($flight->id, $bid->flight_id);
$this->assertTrue($flight->has_bid);
// Refresh
$flight = Flight::find($flight->id);
$this->assertTrue($flight->has_bid);
// Check the table and make sure the entry is there
$bid_retrieved = $this->bidSvc->addBid($flight, $user);
$this->assertEquals($bid->id, $bid_retrieved->id);
$user->refresh();
$bids = $user->bids;
$this->assertEquals(1, $bids->count());
// Query the API and see that the user has the bids
// And pull the flight details for the user/bids
$req = $this->get('/api/user', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertCount(1, $body['bids']);
$this->assertEquals($flight->id, $body['bids'][0]['flight_id']);
$req = $this->get('/api/users/'.$user->id.'/bids', $headers);
$body = $req->json()['data'];
$req->assertStatus(200);
$this->assertEquals($flight->id, $body[0]['flight_id']);
// have a second user bid on it
$bid_user2 = $this->bidSvc->addBid($flight, $user2);
$this->assertNotNull($bid_user2);
$this->assertNotEquals($bid_retrieved->id, $bid_user2->id);
// Now remove the flight and check API
$this->bidSvc->removeBid($flight, $user);
$flight = Flight::find($flight->id);
// user2 still has a bid on it
$this->assertTrue($flight->has_bid);
// Remove it from 2nd user
$this->bidSvc->removeBid($flight, $user2);
$flight->refresh();
$this->assertFalse($flight->has_bid);
$user->refresh();
$bids = $user->bids()->get();
$this->assertTrue($bids->isEmpty());
$req = $this->get('/api/user', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertEquals($user->id, $body['id']);
$this->assertCount(0, $body['bids']);
$req = $this->get('/api/users/'.$user->id.'/bids', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertCount(0, $body);
}
public function testMultipleBidsSingleFlight()
{
$this->settingsRepo->store('bids.disable_flight_on_bid', true);
$user1 = factory(User::class)->create();
$user2 = factory(User::class)->create([
'airline_id' => $user1->airline_id,
]);
$flight = $this->addFlight($user1);
// Put bid on the flight to block it off
$this->bidSvc->addBid($flight, $user1);
// Try adding again, should throw an exception
$this->expectException(\App\Exceptions\BidExistsForFlight::class);
$this->bidSvc->addBid($flight, $user2);
}
/**
* Add a flight bid VIA the API
*/
public function testAddBidApi()
{
$this->user = factory(User::class)->create();
$user2 = factory(User::class)->create();
$flight = $this->addFlight($this->user);
$uri = '/api/user/bids';
$data = ['flight_id' => $flight->id];
$body = $this->put($uri, $data);
$body = $body->json('data');
$this->assertEquals($body['flight_id'], $flight->id);
// Now try to have the second user bid on it
// Should return a 409 error
$response = $this->put($uri, $data, [], $user2);
$response->assertStatus(409);
// Try now deleting the bid from the user
$response = $this->delete($uri, $data);
$body = $response->json('data');
$this->assertCount(0, $body);
}
/**
* Delete a flight and make sure all the bids are gone
*/
public function testDeleteFlightWithBids()
{
$user = factory(User::class)->create();
$headers = $this->headers($user);
$flight = $this->addFlight($user);
$bid = $this->bidSvc->addBid($flight, $user);
$this->assertEquals($user->id, $bid->user_id);
$this->assertEquals($flight->id, $bid->flight_id);
$this->assertTrue($flight->has_bid);
$this->flightSvc->deleteFlight($flight);
$empty_flight = Flight::find($flight->id);
$this->assertNull($empty_flight);
// Make sure no bids exist
$user_bids_count = Bid::where(['flight_id' => $flight->id])->count();
$this->assertEquals(0, $user_bids_count);
// Query the API and see that the user has the bids
// And pull the flight details for the user/bids
$req = $this->get('/api/user', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertEquals($user->id, $body['id']);
$this->assertCount(0, $body['bids']);
$req = $this->get('/api/users/'.$user->id.'/bids', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertCount(0, $body);
}
}

160
tests/FlightTest.php
View File

@@ -1,6 +1,5 @@
<?php
use App\Models\Bid;
use App\Models\Enums\Days;
use App\Models\Flight;
use App\Models\User;
@@ -401,177 +400,18 @@ class FlightTest extends TestCase
$this->assertCount(1, $found);
}
/**
* Add/remove a bid, test the API, etc
*
* @throws \App\Services\Exception
*/
public function testBids()
{
$this->settingsRepo->store('bids.allow_multiple_bids', true);
$this->settingsRepo->store('bids.disable_flight_on_bid', false);
$user = factory(User::class)->create();
$user2 = factory(User::class)->create();
$headers = $this->headers($user);
$flight = $this->addFlight($user);
$bid = $this->flightSvc->addBid($flight, $user);
$this->assertEquals($user->id, $bid->user_id);
$this->assertEquals($flight->id, $bid->flight_id);
$this->assertTrue($flight->has_bid);
// Refresh
$flight = Flight::find($flight->id);
$this->assertTrue($flight->has_bid);
// Check the table and make sure the entry is there
$bid_retrieved = $this->flightSvc->addBid($flight, $user);
$this->assertEquals($bid->id, $bid_retrieved->id);
$user->refresh();
$bids = $user->bids;
$this->assertEquals(1, $bids->count());
// Query the API and see that the user has the bids
// And pull the flight details for the user/bids
$req = $this->get('/api/user', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertCount(1, $body['bids']);
$this->assertEquals($flight->id, $body['bids'][0]['flight_id']);
$req = $this->get('/api/users/'.$user->id.'/bids', $headers);
$body = $req->json()['data'];
$req->assertStatus(200);
$this->assertEquals($flight->id, $body[0]['flight_id']);
// have a second user bid on it
$bid_user2 = $this->flightSvc->addBid($flight, $user2);
$this->assertNotNull($bid_user2);
$this->assertNotEquals($bid_retrieved->id, $bid_user2->id);
// Now remove the flight and check API
$this->flightSvc->removeBid($flight, $user);
$flight = Flight::find($flight->id);
// user2 still has a bid on it
$this->assertTrue($flight->has_bid);
// Remove it from 2nd user
$this->flightSvc->removeBid($flight, $user2);
$flight->refresh();
$this->assertFalse($flight->has_bid);
$user->refresh();
$bids = $user->bids()->get();
$this->assertTrue($bids->isEmpty());
$req = $this->get('/api/user', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertEquals($user->id, $body['id']);
$this->assertCount(0, $body['bids']);
$req = $this->get('/api/users/'.$user->id.'/bids', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertCount(0, $body);
}
public function testMultipleBidsSingleFlight()
{
$this->settingsRepo->store('bids.disable_flight_on_bid', true);
$user1 = factory(User::class)->create();
$user2 = factory(User::class)->create([
'airline_id' => $user1->airline_id,
]);
$flight = $this->addFlight($user1);
// Put bid on the flight to block it off
$this->flightSvc->addBid($flight, $user1);
// Try adding again, should throw an exception
$this->expectException(\App\Exceptions\BidExistsForFlight::class);
$this->flightSvc->addBid($flight, $user2);
}
/**
* Add a flight bid VIA the API
*/
public function testAddBidApi()
{
$this->user = factory(User::class)->create();
$user2 = factory(User::class)->create();
$flight = $this->addFlight($this->user);
$uri = '/api/user/bids';
$data = ['flight_id' => $flight->id];
$body = $this->put($uri, $data);
$body = $body->json('data');
$this->assertEquals($body['flight_id'], $flight->id);
// Now try to have the second user bid on it
// Should return a 409 error
$response = $this->put($uri, $data, [], $user2);
$response->assertStatus(409);
// Try now deleting the bid from the user
$response = $this->delete($uri, $data);
$body = $response->json('data');
$this->assertCount(0, $body);
}
/**
* Delete a flight and make sure all the bids are gone
*/
public function testDeleteFlight()
{
$user = factory(User::class)->create();
$headers = $this->headers($user);
$flight = $this->addFlight($user);
$bid = $this->flightSvc->addBid($flight, $user);
$this->assertEquals($user->id, $bid->user_id);
$this->assertEquals($flight->id, $bid->flight_id);
$this->assertTrue($flight->has_bid);
$this->flightSvc->deleteFlight($flight);
$empty_flight = Flight::find($flight->id);
$this->assertNull($empty_flight);
// Make sure no bids exist
$user_bids = Bid::where('flight_id', $flight->id)->get();
//$this->assertEquals(0, $user_bid->count());
// Query the API and see that the user has the bids
// And pull the flight details for the user/bids
$req = $this->get('/api/user', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertEquals($user->id, $body['id']);
$this->assertCount(0, $body['bids']);
$req = $this->get('/api/users/'.$user->id.'/bids', $headers);
$req->assertStatus(200);
$body = $req->json()['data'];
$this->assertCount(0, $body);
}
public function testAirportDistance()

5
tests/PIREPTest.php
View File

@@ -7,6 +7,7 @@ use App\Models\Enums\PirepState;
use App\Models\Pirep;
use App\Models\User;
use App\Repositories\SettingRepository;
use App\Services\BidService;
use App\Services\FlightService;
use App\Services\PirepService;
use Carbon\Carbon;
@@ -358,6 +359,7 @@ class PIREPTest extends TestCase
*/
public function testPirepBidRemoved()
{
$bidSvc = app(BidService::class);
$flightSvc = app(FlightService::class);
$this->settingsRepo->store('pireps.remove_bid_on_accept', true);
@@ -370,11 +372,12 @@ class PIREPTest extends TestCase
'route_leg' => null,
]);
$flightSvc->addBid($flight, $user);
$bidSvc->addBid($flight, $user);
$pirep = factory(App\Models\Pirep::class)->create([
'user_id' => $user->id,
'airline_id' => $flight->airline_id,
'flight_id' => $flight->id,
'flight_number' => $flight->flight_number,
]);