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

Fix for bad unit conversions in API responses

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-09-20 09:05:09 -04:00
parent 5f9e7d5754
commit eb27c94637
10 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,10 +35,8 @@ class Flight extends Response
$res['ident'] = $this->ident;
if (!empty($res['distance'])) {
$distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
}
$distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
$res['airline'] = new Airline($this->airline);
$res['subfleets'] = Subfleet::collection($this->subfleets);

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

@@ -24,21 +24,27 @@ class Pirep extends Response
$res['ident'] = $this->ident;
// Set these to the response units
if (!empty($res['distance'])) {
$distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
if (!array_key_exists('distance', $res)) {
$res['distance'] = 0;
}
if (!empty($res['fuel_used'])) {
$fuel_used = new Fuel($res['fuel_used'], config('phpvms.internal_units.fuel'));
$res['fuel_used'] = $fuel_used->getResponseUnits();
$distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
if (!array_key_exists('fuel_used', $res)) {
$res['fuel_used'] = 0;
}
if (!empty($res['planned_distance'])) {
$planned_dist = new Distance($res['planned_distance'], config('phpvms.internal_units.distance'));
$res['planned_distance'] = $planned_dist->getResponseUnits();
$fuel_used = new Fuel($res['fuel_used'], config('phpvms.internal_units.fuel'));
$res['fuel_used'] = $fuel_used->getResponseUnits();
if (! array_key_exists('planned_distance', $res)) {
$res['planned_distance'] = 0;
}
$planned_dist = new Distance($res['planned_distance'], config('phpvms.internal_units.distance'));
$res['planned_distance'] = $planned_dist->getResponseUnits();
/*
* Relationship fields
*/