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

Check for null values when checking pilot ID #760 (#768)

Browse Source
This commit is contained in:
Nabeel S
2020-07-14 22:02:35 -04:00
committed by GitHub
parent 64e4c91e7e
commit bbb5f1d13c
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Services/UserService.php
View File

@@ -8,6 +8,7 @@ use App\Events\UserStateChanged;
use App\Events\UserStatsChanged;
use App\Exceptions\PilotIdNotFound;
use App\Exceptions\UserPilotIdExists;
use App\Models\Airline;
use App\Models\Enums\PirepState;
use App\Models\Enums\UserState;
use App\Models\Pirep;
@@ -188,22 +189,33 @@ class UserService extends Service
* Split a given pilot ID into an airline and ID portions
*
* @param string $pilot_id
*
* @return User
*/
public function findUserByPilotId(string $pilot_id)
public function findUserByPilotId(string $pilot_id): User
{
$pilot_id = trim($pilot_id);
if (empty($pilot_id)) {
throw new PilotIdNotFound('');
}
$airlines = $this->airlineRepo->all(['id', 'icao', 'iata']);
$ident_str = null;
$pilot_id = strtoupper($pilot_id);
/** @var Airline $airline */
foreach ($airlines as $airline) {
if (strpos($pilot_id, $airline->icao) !== false) {
$ident_str = $airline->icao;
break;
}
if (strpos($pilot_id, $airline->iata) !== false) {
$ident_str = $airline->iata;
break;
if (!empty($airline->iata)) {
if (strpos($pilot_id, $airline->iata) !== false) {
$ident_str = $airline->iata;
break;
}
}
}