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

code styling

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-06-10 18:41:35 -05:00
parent bf910e4549
commit 64aeb0343b
3 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Services/AircraftService.php
View File

@@ -2,7 +2,6 @@
namespace App\Services; namespace App\Services;
use App\Models\Aircraft;
use App\Models\AircraftClass; use App\Models\AircraftClass;
use Dompdf\Exception; use Dompdf\Exception;

6
app/Services/FareService.php
View File

@@ -16,7 +16,7 @@ class FareService extends BaseService {
* *
* @return Aircraft * @return Aircraft
*/ */
public function set_for_aircraft( public function setForAircraft(
Aircraft &$aircraft, Aircraft &$aircraft,
Fare &$fare, Fare &$fare,
array $override=[] array $override=[]
@@ -40,7 +40,7 @@ class FareService extends BaseService {
* @param Aircraft $aircraft * @param Aircraft $aircraft
* @return Fare[] * @return Fare[]
*/ */
public function get_for_aircraft(Aircraft &$aircraft) public function getForAircraft(Aircraft &$aircraft)
{ {
$fares = []; $fares = [];
foreach($aircraft->fares as $fare) { foreach($aircraft->fares as $fare) {
@@ -61,7 +61,7 @@ class FareService extends BaseService {
return $fares; return $fares;
} }
public function delete_from_aircraft(Aircraft &$aircraft, Fare &$fare) public function delFromAircraft(Aircraft &$aircraft, Fare &$fare)
{ {
$aircraft->fares()->detach($fare->id); $aircraft->fares()->detach($fare->id);
$aircraft = $aircraft->fresh(); $aircraft = $aircraft->fresh();

50
tests/AircraftTest.php
View File

@@ -1,7 +1,5 @@
<?php <?php
use App\Models\Aircraft;
use App\Services\AircraftService;
class AircraftTest extends TestCase class AircraftTest extends TestCase
{ {
@@ -24,19 +22,19 @@ class AircraftTest extends TestCase
factory(App\Models\Fare::class)->create(); factory(App\Models\Fare::class)->create();
} }
protected function get_ac_class() protected function getAircraftClass()
{ {
return app('App\Repositories\AircraftClassRepository') return app('App\Repositories\AircraftClassRepository')
->findByField('code', 'H')->first(); ->findByField('code', 'H')->first();
} }
protected function find_by_icao($icao) protected function findByICAO($icao)
{ {
$ac_repo = app('App\Repositories\AircraftRepository'); $ac_repo = app('App\Repositories\AircraftRepository');
return $ac_repo->findByICAO($icao); return $ac_repo->findByICAO($icao);
} }
protected function get_fare_by_code($code) protected function getFareByCode($code)
{ {
return app('App\Repositories\FareRepository')->findByCode($code); return app('App\Repositories\FareRepository')->findByCode($code);
} }
@@ -46,25 +44,25 @@ class AircraftTest extends TestCase
* Mostly to experiment with the ORM type stuff. This isn't * Mostly to experiment with the ORM type stuff. This isn't
* where most of the testing, etc is required. * where most of the testing, etc is required.
*/ */
protected function add_aircraft() protected function addAircraft()
{ {
$svc = app('App\Services\AircraftService'); $svc = app('App\Services\AircraftService');
$err = $svc->create([ $err = $svc->create([
'icao' => $this->ICAO, 'icao' => $this->ICAO,
'name' => 'Boeing 777', 'name' => 'Boeing 777',
], $this->get_ac_class()); ], $this->getAircraftClass());
$this->assertNotFalse($err); $this->assertNotFalse($err);
return $this->find_by_icao($this->ICAO); return $this->findByICAO($this->ICAO);
} }
public function testAircraftClasses() public function testAircraftClasses()
{ {
$aircraft = $this->add_aircraft(); $aircraft = $this->addAircraft();
$this->assertEquals($this->ICAO, $aircraft->icao, 'ICAO matching'); $this->assertEquals($this->ICAO, $aircraft->icao, 'ICAO matching');
$this->assertEquals( $this->assertEquals(
$this->get_ac_class(), $this->getAircraftClass(),
$aircraft->class, $aircraft->class,
'Check belongsTo relationship' 'Check belongsTo relationship'
); );
@@ -74,11 +72,11 @@ class AircraftTest extends TestCase
{ {
$fare_svc = app('App\Services\FareService'); $fare_svc = app('App\Services\FareService');
$aircraft = $this->add_aircraft(); $aircraft = $this->addAircraft();
$fare = $this->get_fare_by_code('Y'); $fare = $this->getFareByCode('Y');
$fare_svc->set_for_aircraft($aircraft, $fare); $fare_svc->setForAircraft($aircraft, $fare);
$ac_fares = $fare_svc->get_for_aircraft($aircraft); $ac_fares = $fare_svc->getForAircraft($aircraft);
$this->assertCount(1, $ac_fares); $this->assertCount(1, $ac_fares);
$this->assertEquals($fare->price, $ac_fares[0]->price); $this->assertEquals($fare->price, $ac_fares[0]->price);
@@ -87,34 +85,34 @@ class AircraftTest extends TestCase
# #
# set an override now # set an override now
# #
$fare_svc->set_for_aircraft($aircraft, $fare, [ $fare_svc->setForAircraft($aircraft, $fare, [
'price' => 50, 'capacity' => 400 'price' => 50, 'capacity' => 400
]); ]);
# look for them again # look for them again
$ac_fares = $fare_svc->get_for_aircraft($aircraft); $ac_fares = $fare_svc->getForAircraft($aircraft);
$this->assertCount(1, $ac_fares); $this->assertCount(1, $ac_fares);
$this->assertEquals(50, $ac_fares[0]->price); $this->assertEquals(50, $ac_fares[0]->price);
$this->assertEquals(400, $ac_fares[0]->capacity); $this->assertEquals(400, $ac_fares[0]->capacity);
# delete # delete
$fare_svc->delete_from_aircraft($aircraft, $fare); $fare_svc->delFromAircraft($aircraft, $fare);
$this->assertCount(0, $fare_svc->get_for_aircraft($aircraft)); $this->assertCount(0, $fare_svc->getForAircraft($aircraft));
} }
public function testAircraftFaresOverride() public function testAircraftFaresOverride()
{ {
$fare_svc = app('App\Services\FareService'); $fare_svc = app('App\Services\FareService');
$aircraft = $this->add_aircraft(); $aircraft = $this->addAircraft();
$fare = $this->get_fare_by_code('Y'); $fare = $this->getFareByCode('Y');
$fare_svc->set_for_aircraft($aircraft, $fare, [ $fare_svc->setForAircraft($aircraft, $fare, [
'price' => 50, 'capacity' => 400 'price' => 50, 'capacity' => 400
]); ]);
$ac_fares = $fare_svc->get_for_aircraft($aircraft); $ac_fares = $fare_svc->getForAircraft($aircraft);
$this->assertCount(1, $ac_fares); $this->assertCount(1, $ac_fares);
$this->assertEquals(50, $ac_fares[0]->price); $this->assertEquals(50, $ac_fares[0]->price);
@@ -124,19 +122,19 @@ class AircraftTest extends TestCase
# update the override to a different amount and make sure it updates # update the override to a different amount and make sure it updates
# #
$fare_svc->set_for_aircraft($aircraft, $fare, [ $fare_svc->setForAircraft($aircraft, $fare, [
'price' => 150, 'capacity' => 50 'price' => 150, 'capacity' => 50
]); ]);
$ac_fares = $fare_svc->get_for_aircraft($aircraft); $ac_fares = $fare_svc->getForAircraft($aircraft);
$this->assertCount(1, $ac_fares); $this->assertCount(1, $ac_fares);
$this->assertEquals(150, $ac_fares[0]->price); $this->assertEquals(150, $ac_fares[0]->price);
$this->assertEquals(50, $ac_fares[0]->capacity); $this->assertEquals(50, $ac_fares[0]->capacity);
# delete # delete
$fare_svc->delete_from_aircraft($aircraft, $fare); $fare_svc->delFromAircraft($aircraft, $fare);
$this->assertCount(0, $fare_svc->get_for_aircraft($aircraft)); $this->assertCount(0, $fare_svc->getForAircraft($aircraft));
} }
/** /**