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

Default PirepState logic and location change (#1317)

Browse Source 
* Update PirepService.php

Moved `$default_state` logic below `PirepFiled` event, so admins can have some flexibility to define their own default states by listening that event.

Any ideas ?

Hopefully closes #1312

* Update PirepService.php

Added the missing `$pirep->refresh();`
This commit is contained in:
B.Fatih KOZ
2021-09-23 22:04:24 +03:00
committed by GitHub
parent bd892f5407
commit 14e33574fc
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Services/PirepService.php
View File

@@ -460,19 +460,6 @@ class PirepService extends Service
*/ */
public function submit(Pirep $pirep) public function submit(Pirep $pirep)
{ {
// Figure out what default state should be. Look at the default
// behavior from the rank that the pilot is assigned to
$default_state = PirepState::PENDING;
if ($pirep->source === PirepSource::ACARS) {
if ($pirep->user->rank->auto_approve_acars) {
$default_state = PirepState::ACCEPTED;
}
} else {
if ($pirep->user->rank->auto_approve_manual) {
$default_state = PirepState::ACCEPTED;
}
}
// Check if there is a simbrief_id, change it to be set to the PIREP // Check if there is a simbrief_id, change it to be set to the PIREP
// at the end of the flight when it's been submitted finally. // at the end of the flight when it's been submitted finally.
// Prefile, Save (as draft) and File already have this but the Submit button // Prefile, Save (as draft) and File already have this but the Submit button
@@ -489,6 +476,24 @@ class PirepService extends Service
Log::info('New PIREP filed', [$pirep]); Log::info('New PIREP filed', [$pirep]);
event(new PirepFiled($pirep)); event(new PirepFiled($pirep));
$pirep->refresh();
// Figure out what pirep state should be, if nothing provided yet.
if ($pirep->state != PirepState::ACCEPTED || $pirep->state != PirepState::REJECTED) {
$default_state = PirepState::PENDING;
} else {
$default_state = $pirep->state;
}
// If pirep is still at PENDING state decide the default behavior by looking at rank settings
if ($pirep->state === PirepState::PENDING) {
if ($pirep->source === PirepSource::ACARS && $pirep->user->rank->auto_approve_acars) {
$default_state = PirepState::ACCEPTED;
} elseif ($pirep->source === PirepSource::MANUAL && $pirep->user->rank->auto_approve_manual) {
$default_state = PirepState::ACCEPTED;
}
}
// only update the pilot last state if they are accepted // only update the pilot last state if they are accepted
if ($default_state === PirepState::ACCEPTED) { if ($default_state === PirepState::ACCEPTED) {
$pirep = $this->accept($pirep); $pirep = $this->accept($pirep);