Push pack services and fix for failing tests

Author: DaneEveritt

app/Contracts/Repository/PackRepositoryInterface.php

@@ -28,12 +28,32 @@
 
 interface PackRepositoryInterface extends RepositoryInterface, SearchableInterface
 {
+    /**
+     * Return a paginated listing of packs with their associated option and server count.
+     *
+     * @param int $paginate
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     */
+    public function paginateWithOptionAndServerCount($paginate = 50);
+
+    /**
+     * Return a pack with the associated server models attached to it.
+     *
+     * @param  int $id
+     * @return \Illuminate\Database\Eloquent\Collection
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+     */
+    public function getWithServers($id);
+
     /**
      * Return all of the file archives for a given pack.
      *
      * @param  int  $id
      * @param  bool $collection
      * @return object|\Illuminate\Support\Collection
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
      */
     public function getFileArchives($id, $collection = false);
 }

app/Exceptions/Service/HasActiveServersException.php

@@ -24,7 +24,9 @@
 
 namespace Pterodactyl\Exceptions\Service;
 
-class HasActiveServersException extends \Exception
+use Pterodactyl\Exceptions\DisplayException;
+
+class HasActiveServersException extends DisplayException
 {
     //
 }

app/Exceptions/Service/Pack/ZipArchiveCreationException.php

@@ -0,0 +1,30 @@
+<?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\Pack;
+
+class ZipArchiveCreationException extends \Exception
+{
+    //
+}

app/Http/Controllers/Admin/NodesController.php

@@ -174,6 +174,8 @@ public function store(NodeFormRequest $request)
      *
      * @param  int $node
      * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function viewIndex($node)
     {
@@ -213,6 +215,8 @@ public function viewConfiguration(Node $node)
      *
      * @param  int $node
      * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function viewAllocation($node)
     {
@@ -227,6 +231,8 @@ public function viewAllocation($node)
      *
      * @param  int $node
      * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function viewServers($node)
     {
@@ -299,9 +305,10 @@ public function allocationRemoveBlock(Request $request, $node)
      * Sets an alias for a specific allocation on a node.
      *
      * @param  \Pterodactyl\Http\Requests\Admin\Node\AllocationAliasFormRequest $request
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
+     * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function allocationSetAlias(AllocationAliasFormRequest $request)
     {

app/Http/Controllers/Admin/OptionController.php

@@ -30,7 +30,6 @@
 use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
-use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Services\Services\Options\OptionUpdateService;
 use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 use Pterodactyl\Services\Services\Options\OptionCreationService;
@@ -81,13 +80,13 @@ class OptionController extends Controller
     /**
      * OptionController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                                    $alert
-     * @param \Pterodactyl\Services\Services\Options\InstallScriptUpdateService    $installScriptUpdateService
-     * @param \Pterodactyl\Services\Services\Options\OptionCreationService         $optionCreationService
-     * @param \Pterodactyl\Services\Services\Options\OptionDeletionService         $optionDeletionService
-     * @param \Pterodactyl\Services\Services\Options\OptionUpdateService           $optionUpdateService
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface         $serviceRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface   $serviceOptionRepository
+     * @param \Prologue\Alerts\AlertsMessageBag                                  $alert
+     * @param \Pterodactyl\Services\Services\Options\InstallScriptUpdateService  $installScriptUpdateService
+     * @param \Pterodactyl\Services\Services\Options\OptionCreationService       $optionCreationService
+     * @param \Pterodactyl\Services\Services\Options\OptionDeletionService       $optionDeletionService
+     * @param \Pterodactyl\Services\Services\Options\OptionUpdateService         $optionUpdateService
+     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface       $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $serviceOptionRepository
      */
     public function __construct(
         AlertsMessageBag $alert,
@@ -147,17 +146,13 @@ public function store(ServiceOptionFormRequest $request)
      *
      * @param  \Pterodactyl\Models\ServiceOption $option
      * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
     public function destroy(ServiceOption $option)
     {
-        try {
-            $this->optionDeletionService->handle($option->id);
-            $this->alert->success(trans('admin/services.options.notices.option_deleted'))->flash();
-        } catch (HasActiveServersException $exception) {
-            $this->alert->danger($exception->getMessage())->flash();
-
-            return redirect()->route('admin.services.option.view', $option->id);
-        }
+        $this->optionDeletionService->handle($option->id);
+        $this->alert->success(trans('admin/services.options.notices.option_deleted'))->flash();
 
         return redirect()->route('admin.services.view', $option->service_id);
     }