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

Data cleanup; set flight ident in response

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-05-13 16:59:35 -05:00
parent 63897a5666
commit c8a9ebd26d
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Database/seeds/sample.yml
View File

@@ -411,6 +411,12 @@ flight_field_values:
flight_subfleet: flight_subfleet:
- subfleet_id: 1 - subfleet_id: 1
flight_id: flightid_1 flight_id: flightid_1
- subfleet_id: 1
flight_id: flightid_2
- subfleet_id: 1
flight_id: flightid_3
- subfleet_id: 1
flight_id: flightid_4
bids: bids:
- id: 100 - id: 100

2
app/Http/Resources/Flight.php
View File

@@ -25,6 +25,8 @@ class Flight extends Resource
{ {
$flight = parent::toArray($request); $flight = parent::toArray($request);
$flight['ident'] = $this->ident;
// Return multiple measures so the client can pick what they want // Return multiple measures so the client can pick what they want
if ($this->distance instanceof Distance) { if ($this->distance instanceof Distance) {
$flight['distance'] = $this->distance->units; $flight['distance'] = $this->distance->units;

2
app/Http/Resources/UserBid.php
View File

@@ -12,7 +12,7 @@ class UserBid extends Resource
'id' => $this->id, 'id' => $this->id,
'user_id' => $this->user_id, 'user_id' => $this->user_id,
'flight_id' => $this->flight_id, 'flight_id' => $this->flight_id,
'flight' => Flight::collection($this->whenLoaded('flight')) 'flights' => Flight::collection($this->whenLoaded('flight'))
#'created_at' => $this->created_at, #'created_at' => $this->created_at,
#'updated_at' => $this->updated_at, #'updated_at' => $this->updated_at,
]; ];

8
app/Models/Flight.php
View File

@@ -112,14 +112,14 @@ class Flight extends Model
$flight_id = $this->airline->code; $flight_id = $this->airline->code;
$flight_id .= $this->flight_number; $flight_id .= $this->flight_number;
if (filled($this->route_code)) {
$flight_id .= '/C'.$this->route_code;
}
if (filled($this->route_leg)) { if (filled($this->route_leg)) {
$flight_id .= '/L'.$this->route_leg; $flight_id .= '/L'.$this->route_leg;
} }
if (filled($this->route_code)) {
$flight_id .= '/C'.$this->route_code;
}
return $flight_id; return $flight_id;
} }