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

FlightRouteAwards - fix if last pirep is empty/other error conditions (#886)

Browse Source
This commit is contained in:
Nabeel S
2020-10-22 16:25:52 -04:00
committed by GitHub
parent 1c9d1c1733
commit 584d37f230
4 changed files with 82 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/Awards/Awards/FlightRouteAwards.php
View File

@@ -3,6 +3,8 @@
namespace Modules\Awards\Awards;
use App\Contracts\Award;
use ErrorException;
use Illuminate\Support\Facades\Log;
/**
* All award classes need to extend Award and implement the check() method
@@ -44,17 +46,26 @@ class FlightRouteAwards extends Award
*/
public function check($dptarr = null): bool
{
if (!$dptarr) {
$dptarr = 'XXXX:YYYY';
if ($this->user->last_pirep_id === null) {
return false;
}
$dptarr = strtoupper(trim($dptarr));
if (empty($dptarr)) {
Log::error('FlightRouteAwards: empty departure/arrival string');
return false;
}
try {
[$dpt_icao, $arr_icao] = explode(':', $dptarr);
} catch (ErrorException $e) {
Log::error('FlightRouteAwards: Invalid departure/arrival, val="'.$dptarr.'\"');
return false;
}
$pieces = explode(':', $dptarr);
$dpt = $this->user->last_pirep->dpt_airport_id;
$arr = $this->user->last_pirep->arr_airport_id;
if (strcasecmp($dpt, $pieces[0]) == 0 && strcasecmp($arr, $pieces[1]) == 0) {
return true;
}
return false;
return $dpt === $dpt_icao && $arr === $arr_icao;
}
}