Set user on ON_LEAVE automatically after days in settings() #96
This commit is contained in:
@@ -16,6 +16,7 @@ class DatabaseSeeder extends Seeder
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the database seeds.
|
* Run the database seeds.
|
||||||
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function run()
|
public function run()
|
||||||
{
|
{
|
||||||
|
|||||||
48
app/Listeners/Cron/Nightly/PilotLeave.php
Normal file
48
app/Listeners/Cron/Nightly/PilotLeave.php
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Listeners\Cron\Nightly;
|
||||||
|
|
||||||
|
use App\Events\CronNightly;
|
||||||
|
use App\Interfaces\Listener;
|
||||||
|
use App\Models\Enums\UserState;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Services\UserService;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine if any pilots should be set to ON LEAVE status
|
||||||
|
* @package App\Listeners\Cron\Nightly
|
||||||
|
*/
|
||||||
|
class PilotLeave extends Listener
|
||||||
|
{
|
||||||
|
private $userSvc;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PilotLeave constructor.
|
||||||
|
*/
|
||||||
|
public function __construct(UserService $userSvc)
|
||||||
|
{
|
||||||
|
$this->userSvc = $userSvc;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set any users to being on leave after X days
|
||||||
|
* @param CronNightly $event
|
||||||
|
* @throws \UnexpectedValueException
|
||||||
|
* @throws \InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function handle(CronNightly $event): void
|
||||||
|
{
|
||||||
|
if(setting('pilots.auto_leave_days') === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$date = Carbon::now()->subDay(setting('pilots.auto_leave_days'));
|
||||||
|
$users = User::where('status', UserState::ACTIVE)
|
||||||
|
->whereDate('updated_at', '<', $date);
|
||||||
|
|
||||||
|
foreach($users as $user) {
|
||||||
|
$this->userSvc->stStatusOnLeave($user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,6 +8,8 @@ use App\Events\CronWeekly;
|
|||||||
use App\Events\Expenses;
|
use App\Events\Expenses;
|
||||||
use App\Events\UserStatsChanged;
|
use App\Events\UserStatsChanged;
|
||||||
use App\Listeners\AwardListener;
|
use App\Listeners\AwardListener;
|
||||||
|
use App\Listeners\Cron\Nightly\ApplyExpenses;
|
||||||
|
use App\Listeners\Cron\Nightly\PilotLeave;
|
||||||
use App\Listeners\Cron\Nightly\RecalculateBalances;
|
use App\Listeners\Cron\Nightly\RecalculateBalances;
|
||||||
use App\Listeners\ExpenseListener;
|
use App\Listeners\ExpenseListener;
|
||||||
use App\Listeners\FinanceEvents;
|
use App\Listeners\FinanceEvents;
|
||||||
@@ -24,8 +26,9 @@ class EventServiceProvider extends ServiceProvider
|
|||||||
|
|
||||||
# Cron hooks
|
# Cron hooks
|
||||||
CronNightly::class => [
|
CronNightly::class => [
|
||||||
\App\Listeners\Cron\Nightly\ApplyExpenses::class,
|
ApplyExpenses::class,
|
||||||
RecalculateBalances::class,
|
RecalculateBalances::class,
|
||||||
|
PilotLeave::class,
|
||||||
],
|
],
|
||||||
|
|
||||||
CronWeekly::class => [
|
CronWeekly::class => [
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Services;
|
|||||||
use App\Events\PirepAccepted;
|
use App\Events\PirepAccepted;
|
||||||
use App\Events\PirepFiled;
|
use App\Events\PirepFiled;
|
||||||
use App\Events\PirepRejected;
|
use App\Events\PirepRejected;
|
||||||
|
use App\Events\UserStateChanged;
|
||||||
use App\Events\UserStatsChanged;
|
use App\Events\UserStatsChanged;
|
||||||
use App\Interfaces\Service;
|
use App\Interfaces\Service;
|
||||||
use App\Models\Acars;
|
use App\Models\Acars;
|
||||||
@@ -12,6 +13,7 @@ use App\Models\Bid;
|
|||||||
use App\Models\Enums\AcarsType;
|
use App\Models\Enums\AcarsType;
|
||||||
use App\Models\Enums\PirepSource;
|
use App\Models\Enums\PirepSource;
|
||||||
use App\Models\Enums\PirepState;
|
use App\Models\Enums\PirepState;
|
||||||
|
use App\Models\Enums\UserState;
|
||||||
use App\Models\Navdata;
|
use App\Models\Navdata;
|
||||||
use App\Models\Pirep;
|
use App\Models\Pirep;
|
||||||
use App\Models\PirepFieldValues;
|
use App\Models\PirepFieldValues;
|
||||||
@@ -199,6 +201,15 @@ class PirepService extends Service
|
|||||||
$this->setPilotState($pirep->pilot, $pirep);
|
$this->setPilotState($pirep->pilot, $pirep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Check the user state, set them to ACTIVE if on leave
|
||||||
|
if($pirep->user->state !== UserState::ACTIVE) {
|
||||||
|
$old_state = $pirep->user->state;
|
||||||
|
$pirep->user->state = UserState::ACTIVE;
|
||||||
|
$pirep->user->save();
|
||||||
|
|
||||||
|
event(new UserStateChanged($pirep->user, $old_state));
|
||||||
|
}
|
||||||
|
|
||||||
return $pirep;
|
return $pirep;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ class UserService extends Service
|
|||||||
}
|
}
|
||||||
|
|
||||||
$subfleets = $user->rank->subfleets();
|
$subfleets = $user->rank->subfleets();
|
||||||
|
|
||||||
return $subfleets->with('aircraft')->get();
|
return $subfleets->with('aircraft')->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -213,6 +212,23 @@ class UserService extends Service
|
|||||||
return $user;
|
return $user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the user's status to being on leave
|
||||||
|
* @param User $user
|
||||||
|
* @return User
|
||||||
|
*/
|
||||||
|
public function stStatusOnLeave(User $user): User
|
||||||
|
{
|
||||||
|
$user->refresh();
|
||||||
|
$user->state = UserState::ON_LEAVE;
|
||||||
|
$user->save();
|
||||||
|
|
||||||
|
event(new UserStateChanged($user, UserState::ACTIVE));
|
||||||
|
|
||||||
|
$user->refresh();
|
||||||
|
return $user;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recount/update all of the stats for a user
|
* Recount/update all of the stats for a user
|
||||||
* @param User $user
|
* @param User $user
|
||||||
|
|||||||
Reference in New Issue
Block a user