Begin refactoring Tasks to be apart of the Scheduler system

Author: DaneEveritt

app/Console/Commands/MakeUser.php

@@ -25,7 +25,6 @@
 namespace Pterodactyl\Console\Commands;
 
 use Illuminate\Console\Command;
-use Pterodactyl\Repositories\UserRepository;
 use Pterodactyl\Services\Users\UserCreationService;
 
 class MakeUser extends Command
@@ -60,8 +59,7 @@ class MakeUser extends Command
      */
     public function __construct(
         UserCreationService $creationService
-    )
-    {
+    ) {
         parent::__construct();
         $this->creationService = $creationService;
     }
@@ -87,7 +85,6 @@ public function handle()
         $data['root_admin'] = is_null($this->option('admin')) ? $this->confirm('Is this user a root administrator?') : $this->option('admin');
 
         try {
-
             $this->creationService->handle($data);
 
             return $this->info('User successfully created.');

app/Services/Tasks/TaskUpdateService.php …pository/ScheduleRepositoryInterface.phpapp/Services/Tasks/TaskUpdateService.php renamed to app/Contracts/Repository/ScheduleRepositoryInterface.php app/Services/Tasks/TaskUpdateService.php renamed to app/Contracts/Repository/ScheduleRepositoryInterface.php

@@ -22,26 +22,23 @@
  * SOFTWARE.
  */
 
-namespace Pterodactyl\Services\Tasks;
+namespace Pterodactyl\Contracts\Repository;
 
-use Pterodactyl\Contracts\Repository\TaskRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-
-class TaskUpdateService
+interface ScheduleRepositoryInterface extends RepositoryInterface
 {
-    protected $repository;
-
-    protected $serverRepository;
-
-    public function __construct(
-        ServerRepositoryInterface $serverRepository,
-        TaskRepositoryInterface $repository
-    ) {
-        $this->repository = $repository;
-        $this->serverRepository = $serverRepository;
-    }
+    /**
+     * Return all of the schedules for a given server.
+     *
+     * @param int $server
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getServerSchedules($server);
 
-    public function handle($server, array $data, array $chain = null)
-    {
-    }
+    /**
+     * Return a schedule model with all of the associated tasks as a relationship.
+     *
+     * @param int $schedule
+     * @return \Illuminate\Support\Collection
+     */
+    public function getScheduleWithTasks($schedule);
 }

app/Contracts/Repository/TaskRepositoryInterface.php

@@ -26,22 +26,4 @@
 
 interface TaskRepositoryInterface extends RepositoryInterface
 {
-    /**
-     * Return the parent tasks and the count of children attached to that task.
-     *
-     * @param int $server
-     * @return mixed
-     */
-    public function getParentTasksWithChainCount($server);
-
-    /**
-     * Return a single task for a given server including all of the chained tasks.
-     *
-     * @param int $task
-     * @param int $server
-     * @return mixed
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function getTaskForServer($task, $server);
 }

app/Exceptions/Service/Schedule/Task/TaskIntervalTooLongException.php

@@ -0,0 +1,31 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Exceptions\Service\Schedule\Task;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class TaskIntervalTooLongException extends DisplayException
+{
+}

app/Http/Controllers/Server/Tasks/TaskManagementController.php

@@ -24,20 +24,27 @@
 
 namespace Pterodactyl\Http\Controllers\Server\Tasks;
 
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Requests\Request;
 use Illuminate\Contracts\Session\Session;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Services\Tasks\TaskCreationService;
 use Pterodactyl\Contracts\Extensions\HashidsInterface;
 use Pterodactyl\Traits\Controllers\JavascriptInjection;
-use Pterodactyl\Contracts\Repository\TaskRepositoryInterface;
-use Pterodactyl\Http\Requests\Server\TaskCreationFormRequest;
+use Pterodactyl\Services\Schedules\ScheduleCreationService;
+use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
+use Pterodactyl\Http\Requests\Server\ScheduleCreationFormRequest;
 
 class TaskManagementController extends Controller
 {
     use JavascriptInjection;
 
     /**
-     * @var \Pterodactyl\Services\Tasks\TaskCreationService
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Schedules\ScheduleCreationService
      */
     protected $creationService;
 
@@ -47,7 +54,7 @@ class TaskManagementController extends Controller
     protected $hashids;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\TaskRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface
      */
     protected $repository;
 
@@ -59,17 +66,20 @@ class TaskManagementController extends Controller
     /**
      * TaskManagementController constructor.
      *
-     * @param \Pterodactyl\Contracts\Extensions\HashidsInterface        $hashids
-     * @param \Illuminate\Contracts\Session\Session                     $session
-     * @param \Pterodactyl\Services\Tasks\TaskCreationService           $creationService
-     * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $repository
+     * @param \Prologue\Alerts\AlertsMessageBag                             $alert
+     * @param \Pterodactyl\Contracts\Extensions\HashidsInterface            $hashids
+     * @param \Illuminate\Contracts\Session\Session                         $session
+     * @param \Pterodactyl\Services\Schedules\ScheduleCreationService       $creationService
+     * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository
      */
     public function __construct(
+        AlertsMessageBag $alert,
         HashidsInterface $hashids,
         Session $session,
-        TaskCreationService $creationService,
-        TaskRepositoryInterface $repository
+        ScheduleCreationService $creationService,
+        ScheduleRepositoryInterface $repository
     ) {
+        $this->alert = $alert;
         $this->creationService = $creationService;
         $this->hashids = $hashids;
         $this->repository = $repository;
@@ -86,11 +96,11 @@ public function __construct(
     public function index()
     {
         $server = $this->session->get('server_data.model');
-        $this->authorize('list-tasks', $server);
+        $this->authorize('list-schedules', $server);
         $this->injectJavascript();
 
         return view('server.tasks.index', [
-            'tasks' => $this->repository->getParentTasksWithChainCount($server->id),
+            'schedules' => $this->repository->getServerSchedules($server->id),
             'actions' => [
                 'command' => trans('server.tasks.actions.command'),
                 'power' => trans('server.tasks.actions.power'),
@@ -108,64 +118,95 @@ public function index()
     public function create()
     {
         $server = $this->session->get('server_data.model');
-        $this->authorize('create-task', $server);
+        $this->authorize('create-schedule', $server);
         $this->injectJavascript();
 
         return view('server.tasks.new');
     }
 
     /**
-     * @param \Pterodactyl\Http\Requests\Server\TaskCreationFormRequest $request
-     *
+     * @param \Pterodactyl\Http\Requests\Server\ScheduleCreationFormRequest $request
      * @return \Illuminate\Http\RedirectResponse
      *
-     * @throws \Exception
      * @throws \Illuminate\Auth\Access\AuthorizationException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Schedule\Task\TaskIntervalTooLongException
      */
-    public function store(TaskCreationFormRequest $request)
+    public function store(ScheduleCreationFormRequest $request)
     {
         $server = $this->session->get('server_data.model');
-        $this->authorize('create-task', $server);
+        $this->authorize('create-schedule', $server);
 
-        $task = $this->creationService->handle($server, $request->normalize(), $request->getChainedTasks());
+        $schedule = $this->creationService->handle($server, $request->normalize(), $request->getTasks());
+        $this->alert->success(trans('server.tasks.task_created'))->flash();
 
         return redirect()->route('server.tasks.view', [
             'server' => $server->uuidShort,
-            'task' => $task->id,
+            'task' => $schedule->hashid,
         ]);
     }
 
     /**
-     * Return a view to modify task settings.
+     * Return a view to modify a schedule.
      *
-     * @param string $uuid
-     * @param string $task
+     * @param \Pterodactyl\Http\Requests\Request $request
      * @return \Illuminate\View\View
-     *
      * @throws \Illuminate\Auth\Access\AuthorizationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function view($uuid, $task)
+    public function view(Request $request)
     {
         $server = $this->session->get('server_data.model');
-        $this->authorize('edit-task', $server);
-        $task = $this->repository->getTaskForServer($this->hashids->decodeFirst($task, 0), $server->id);
+        $schedule = $request->attributes->get('schedule');
+        $this->authorize('view-schedule', $server);
 
         $this->injectJavascript([
-            'chained' => $task->chained->map(function ($chain) {
-                return collect($chain->toArray())->only('action', 'chain_delay', 'data')->all();
+            'tasks' => $schedule->tasks->map(function ($schedule) {
+                return collect($schedule->toArray())->only('action', 'time_offset', 'payload')->all();
             }),
         ]);
 
-        return view('server.tasks.view', ['task' => $task]);
+        return view('server.tasks.view', ['schedule' => $schedule]);
+    }
+
+    /**
+     * Update a specific parent task on the system.
+     *
+     * @param \Pterodactyl\Http\Requests\Server\ScheduleCreationFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function update(ScheduleCreationFormRequest $request)
+    {
+        $server = $this->session->get('server_data.model');
+        $schedule = $request->attributes->get('schedule');
+        $this->authorize('edit-schedule', $server);
+
+        //        $this->updateService->handle($task, $request->normalize(), $request->getChainedTasks());
+        $this->alert->success(trans('server.tasks.task_updated'))->flash();
+
+        return redirect()->route('server.tasks.view', [
+            'server' => $server->uuidShort,
+            'task' => $schedule->hashid,
+        ]);
     }
 
-    public function update(TaskCreationFormRequest $request, $uuid, $task)
+    /**
+     * Delete a parent task from the Panel.
+     *
+     * @param \Pterodactyl\Http\Requests\Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function delete(Request $request)
     {
         $server = $this->session->get('server_data.model');
-        $this->authorize('edit-task', $server);
-        $task = $this->repository->getTaskForServer($this->hashids->decodeFirst($task, 0), $server->id);
+        $schedule = $request->attributes->get('schedule');
+        $this->authorize('delete-schedule', $server);
+
+        $this->repository->delete($task->id);
+
+        return response('', 204);
     }
 }