StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add test coverage for schedule execution

Browse source
This commit is contained in:
Dane Everitt 2020-10-14 21:06:27 -07:00
parent c1ee0ac4f8
commit e7c64bc60e
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 106 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Requests/Api/Client/Servers/Schedules/TriggerScheduleRequest.php
View file

@ -3,9 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Schedules;
use Pterodactyl\Models\Permission;
use Illuminate\Foundation\Http\FormRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class TriggerScheduleRequest extends FormRequest
class TriggerScheduleRequest extends ClientApiRequest
{
/**
* @return string
@ -18,7 +18,7 @@ class TriggerScheduleRequest extends FormRequest
/**
* @return array
*/
public function rules()
public function rules(): array
{
return [];
}

9
app/Services/Schedules/ProcessScheduleService.php
View file

@ -6,6 +6,7 @@ use Pterodactyl\Models\Schedule;
use Illuminate\Contracts\Bus\Dispatcher;
use Pterodactyl\Jobs\Schedule\RunTaskJob;
use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Exceptions\DisplayException;
class ProcessScheduleService
{
@ -42,7 +43,13 @@ class ProcessScheduleService
public function handle(Schedule $schedule, bool $now = false)
{
/** @var \Pterodactyl\Models\Task $task */
$task = $schedule->tasks()->where('sequence_id', 1)->firstOrFail();
$task = $schedule->tasks()->where('sequence_id', 1)->first();
if (is_null($task)) {
throw new DisplayException(
'Cannot process schedule for task execution: no tasks are registered.'
);
}
$this->connection->transaction(function () use ($schedule, $task) {
$schedule->forceFill([