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

Make sure user and acars data is sent from API

Browse Source
This commit is contained in:
Nabeel Shahzad
2020-03-29 13:33:14 -04:00
parent 82b873c071
commit e9b30fbe30
8 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Resources/Pirep.php
View File

@@ -27,6 +27,7 @@ class Pirep extends Resource
{
$res = parent::toArray($request);
$res['ident'] = $this->ident;
$res['status_text'] = PirepStatus::label($this->status);
// Set these to the response units
if (!array_key_exists('distance', $res)) {
@@ -62,8 +63,6 @@ class Pirep extends Resource
$res['block_off_time'] = $this->block_off_time->toIso8601ZuluString();
}
$res['status_text'] = PirepStatus::label($this->status);
$res['airline'] = new Airline($this->airline);
$res['dpt_airport'] = new Airport($this->dpt_airport);
$res['arr_airport'] = new Airport($this->arr_airport);
@@ -73,10 +72,13 @@ class Pirep extends Resource
$res['user'] = [
'id' => $this->user->id,
'name' => $this->user->name,
'avatar' => $this->user->resolveAvatarUrl(),
'home_airport_id' => $this->user->home_airport_id,
'curr_airport_id' => $this->user->curr_airport_id,
];
$res['flight'] = Flight::make($this->whenLoaded('flight'));
// format to kvp
$res['fields'] = new PirepFieldCollection($this->fields);

15
app/Http/Resources/User.php
View File

@@ -17,6 +17,7 @@ class User extends Resource
'ident' => $this->ident,
'name' => $this->name,
'email' => $this->email,
'avatar' => $this->resolveAvatarUrl(),
'rank_id' => $this->rank_id,
'home_airport' => $this->home_airport_id,
'curr_airport' => $this->curr_airport_id,
@@ -27,19 +28,9 @@ class User extends Resource
'state' => $this->state,
];
$res['airline'] = Airline::make($this->airline);
$res['airline'] = Airline::make($this->whenLoaded('airline'));
$res['bids'] = UserBid::collection($this->whenLoaded('bids'));
$res['rank'] = Rank::make($this->rank);
/*
* Determine which avatar to send/use
*/
$res['avatar'] = $this->avatar;
if (empty($res['avatar'])) {
$res['avatar'] = $this->gravatar();
} else {
$res['avatar'] = $res['avatar']->url;
}
$res['rank'] = Rank::make($this->whenLoaded('rank'));
return $res;
}