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

fix aircraft status field type in model

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-30 21:45:11 -05:00
parent a3bfcf01b7
commit 9eb8ed1804
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/Aircraft.php
View File

@@ -44,7 +44,6 @@ class Aircraft extends Model
protected $casts = [ protected $casts = [
'subfleet_id' => 'integer', 'subfleet_id' => 'integer',
'zfw' => 'float', 'zfw' => 'float',
'status' => 'integer',
'state' => 'integer', 'state' => 'integer',
]; ];

7
app/Services/ImportService.php
View File

@@ -108,7 +108,12 @@ class ImportService extends Service
// turn it into a collection and run some filtering // turn it into a collection and run some filtering
$row = collect($row)->map(function ($val, $index) { $row = collect($row)->map(function ($val, $index) {
return trim($val); $val = trim($val);
if($val === '') {
return null;
}
return $val;
})->toArray(); })->toArray();
# Try to validate # Try to validate

2
tests/ImporterTest.php
View File

@@ -555,6 +555,8 @@ class ImporterTest extends TestCase
$this->assertEquals($subfleet->id, $aircraft->id); $this->assertEquals($subfleet->id, $aircraft->id);
$this->assertEquals('A320-211', $aircraft->name); $this->assertEquals('A320-211', $aircraft->name);
$this->assertEquals('N309US', $aircraft->registration); $this->assertEquals('N309US', $aircraft->registration);
$this->assertEquals('A', $aircraft->status);
$this->assertEquals(null, $aircraft->zfw);
} }
/** /**

4
tests/data/aircraft.csv
View File

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