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

Cleanup SI Unit classes and interface for REST responses; fixes to a few METAR parsing issues

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-07-15 15:14:40 -04:00
parent 466d04caf7
commit 06d8f11ca3
33 changed files with 399 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Resources/Acars.php
View File

@@ -2,11 +2,7 @@
namespace App\Http\Resources;
use App\Support\Units\Distance;
use App\Support\Units\Fuel;
use Illuminate\Http\Resources\Json\Resource;
class Acars extends Resource
class Acars extends Response
{
/**
* Transform the resource into an array.
@@ -17,16 +13,13 @@ class Acars extends Resource
*/
public function toArray($request)
{
$obj = parent::toArray($request);
$res = parent::toArray($request);
if ($this->distance instanceof Distance) {
$obj['distance'] = $this->distance->units;
}
$this->checkUnitFields($res, [
'distance',
'fuel',
]);
if ($this->fuel instanceof Fuel) {
$obj['fuel'] = $this->fuel->units;
}
return $obj;
return $res;
}
}

4
app/Http/Resources/AcarsLog.php
View File

@@ -2,12 +2,10 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
/**
* ACARS table but only include the fields for the routes
* Class AcarsRoute
*/
class AcarsLog extends Resource
class AcarsLog extends Response
{
}

4
app/Http/Resources/AcarsRoute.php
View File

@@ -2,12 +2,10 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
/**
* ACARS table but only include the fields for the routes
* Class AcarsRoute
*/
class AcarsRoute extends Resource
class AcarsRoute extends Response
{
}

4
app/Http/Resources/Aircraft.php
View File

@@ -2,8 +2,6 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
class Aircraft extends Resource
class Aircraft extends Response
{
}

4
app/Http/Resources/Airline.php
View File

@@ -2,9 +2,7 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
class Airline extends Resource
class Airline extends Response
{
public function toArray($request)
{

4
app/Http/Resources/Airport.php
View File

@@ -2,8 +2,6 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
class Airport extends Resource
class Airport extends Response
{
}

4
app/Http/Resources/Award.php
View File

@@ -2,9 +2,7 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
class Award extends Resource
class Award extends Response
{
public function toArray($request)
{

10
app/Http/Resources/Bid.php
View File

@@ -2,15 +2,13 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
class Bid extends Resource
class Bid extends Response
{
public function toArray($request)
{
$bid = parent::toArray($request);
$bid['flight'] = new Flight($this->flight);
$res = parent::toArray($request);
$res['flight'] = new Flight($this->flight);
return $bid;
return $res;
}
}

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

@@ -3,9 +3,8 @@
namespace App\Http\Resources;
use App\Support\Units\Distance;
use Illuminate\Http\Resources\Json\Resource;
class Flight extends Resource
class Flight extends Response
{
/**
* Set the fields on the flight object
@@ -24,19 +23,19 @@ class Flight extends Resource
public function toArray($request)
{
$flight = parent::toArray($request);
$res = parent::toArray($request);
$flight['ident'] = $this->ident;
$res['ident'] = $this->ident;
// Return multiple measures so the client can pick what they want
if ($this->distance instanceof Distance) {
$flight['distance'] = $this->distance->units;
}
$this->checkUnitFields($res, [
'distance',
]);
$flight['airline'] = new Airline($this->airline);
$flight['subfleets'] = Subfleet::collection($this->subfleets);
$flight['fields'] = $this->setFields();
$res['airline'] = new Airline($this->airline);
$res['subfleets'] = Subfleet::collection($this->subfleets);
$res['fields'] = $this->setFields();
return $flight;
return $res;
}
}

4
app/Http/Resources/JournalTransaction.php
View File

@@ -2,9 +2,7 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\Resource;
class JournalTransaction extends Resource
class JournalTransaction extends Response
{
public function toArray($request)
{

10
app/Http/Resources/Navdata.php
View File

@@ -9,16 +9,16 @@ class Navdata extends Resource
{
public function toArray($request)
{
$point = parent::toArray($request);
$res = parent::toArray($request);
// Some details about the navaid type
$type = [
'type' => $point['type'],
'name' => NavaidType::label($point['type']),
'type' => $res['type'],
'name' => NavaidType::label($res['type']),
];
$point['type'] = $type;
$res['type'] = $type;
return $point;
return $res;
}
}

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

@@ -18,12 +18,12 @@ class News extends Resource
*/
public function toArray($request)
{
$resp = parent::toArray($request);
$resp['user'] = [
$res = parent::toArray($request);
$res['user'] = [
'id' => $this->user->id,
'name' => $this->user->name,
];
return $resp;
return $res;
}
}

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

@@ -3,11 +3,8 @@
namespace App\Http\Resources;
use App\Models\Enums\PirepStatus;
use App\Support\Units\Distance;
use App\Support\Units\Fuel;
use Illuminate\Http\Resources\Json\Resource;
class Pirep extends Resource
class Pirep extends Response
{
/**
* Transform the resource into an array.
@@ -18,43 +15,36 @@ class Pirep extends Resource
*/
public function toArray($request)
{
$pirep = parent::toArray($request);
$res = parent::toArray($request);
$res['ident'] = $this->ident;
$pirep['ident'] = $this->ident;
if ($this->distance instanceof Distance) {
$pirep['distance'] = $this->distance->units;
}
if ($this->fuel_used instanceof Fuel) {
$pirep['fuel_used'] = $this->fuel_used->units;
}
if ($this->planned_distance instanceof Distance) {
$pirep['planned_distance'] = $this->planned_distance->units;
}
$this->checkUnitFields($res, [
'distance',
'fuel_used',
'planned_distance',
]);
/*
* Relationship fields
*/
if ($this->block_on_time) {
$pirep['block_on_time'] = $this->block_on_time->toIso8601ZuluString();
$res['block_on_time'] = $this->block_on_time->toIso8601ZuluString();
}
if ($this->block_off_time) {
$pirep['block_off_time'] = $this->block_off_time->toIso8601ZuluString();
$res['block_off_time'] = $this->block_off_time->toIso8601ZuluString();
}
$pirep['status_text'] = PirepStatus::label($this->status);
$res['status_text'] = PirepStatus::label($this->status);
$pirep['airline'] = new Airline($this->airline);
$pirep['dpt_airport'] = new Airport($this->dpt_airport);
$pirep['arr_airport'] = new Airport($this->arr_airport);
$res['airline'] = new Airline($this->airline);
$res['dpt_airport'] = new Airport($this->dpt_airport);
$res['arr_airport'] = new Airport($this->arr_airport);
$pirep['position'] = new Acars($this->position);
$pirep['comments'] = PirepComment::collection($this->comments);
$pirep['user'] = [
$res['position'] = new Acars($this->position);
$res['comments'] = PirepComment::collection($this->comments);
$res['user'] = [
'id' => $this->user->id,
'name' => $this->user->name,
'home_airport_id' => $this->user->home_airport_id,
@@ -62,8 +52,8 @@ class Pirep extends Resource
];
// format to kvp
$pirep['fields'] = new PirepFieldCollection($this->fields);
$res['fields'] = new PirepFieldCollection($this->fields);
return $pirep;
return $res;
}
}

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

@@ -11,11 +11,11 @@ class PirepFieldCollection extends ResourceCollection
{
public function toArray($request)
{
$obj = [];
$res = [];
foreach ($this->collection as $field) {
$obj[$field->name] = $field->value;
$res[$field->name] = $field->value;
}
return $obj;
return $res;
}
}

19
app/Http/Resources/Response.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Resources;
use App\Interfaces\Unit;
use Illuminate\Http\Resources\Json\Resource;
/**
@@ -9,4 +10,22 @@ use Illuminate\Http\Resources\Json\Resource;
*/
class Response extends Resource
{
/**
* Iterate through the list of $fields and check if they're a "Unit"
* If they are, then add the response
*
* @param $response
* @param array $fields
*/
public function checkUnitFields(&$response, array $fields): void
{
foreach ($fields as $f) {
if ($this->{$f} instanceof Unit) {
$response[$f] = $this->{$f}->getResponseUnits();
} else {
$response[$f] = $this->{$f};
}
}
}
}

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

@@ -8,9 +8,9 @@ class Subfleet extends Resource
{
public function toArray($request)
{
$arr = parent::toArray($request);
$arr['aircraft'] = Aircraft::collection($this->aircraft);
$res = parent::toArray($request);
$res['aircraft'] = Aircraft::collection($this->aircraft);
return $arr;
return $res;
}
}