Fix tests

Author: DaneEveritt

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -89,9 +89,7 @@ public function handle(DaemonPowerRepository $powerRepository, ValidatorFactory
      */
     protected function getQueryBuilder(array $servers, array $nodes)
     {
-        $instance = Server::query()
-            ->where('suspended', false)
-            ->where('installed', Server::STATUS_INSTALLED);
+        $instance = Server::query()->whereNull('status');
 
         if (!empty($nodes) && !empty($servers)) {
             $instance->whereIn('id', $servers)->orWhereIn('node_id', $nodes);

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -66,11 +66,6 @@ public function getByUuid(string $uuid): Server;
      */
     public function isUniqueUuidCombo(string $uuid, string $short): bool;
 
-    /**
-     * Get the amount of servers that are suspended.
-     */
-    public function getSuspendedServersCount(): int;
-
     /**
      * Returns all of the servers that exist for a given node in a paginated response.
      */

app/Http/Controllers/Admin/StatisticsController.php

@@ -8,7 +8,7 @@
 use Pterodactyl\Models\AuditLog;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Models\Permission;
-use Illuminate\Validation\UnauthorizedException;
+use Illuminate\Auth\Access\AuthorizationException;
 use Pterodactyl\Services\Backups\DeleteBackupService;
 use Pterodactyl\Services\Backups\DownloadLinkService;
 use Pterodactyl\Services\Backups\InitiateBackupService;
@@ -63,11 +63,12 @@ public function __construct(
      *
      * @throws \Spatie\Fractalistic\Exceptions\InvalidTransformation
      * @throws \Spatie\Fractalistic\Exceptions\NoTransformerSpecified
+     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function index(Request $request, Server $server): array
     {
         if (!$request->user()->can(Permission::ACTION_BACKUP_READ, $server)) {
-            throw new UnauthorizedException();
+            throw new AuthorizationException();
         }
 
         $limit = min($request->query('per_page') ?? 20, 50);
@@ -109,11 +110,12 @@ public function store(StoreBackupRequest $request, Server $server): array
      *
      * @throws \Spatie\Fractalistic\Exceptions\InvalidTransformation
      * @throws \Spatie\Fractalistic\Exceptions\NoTransformerSpecified
+     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function view(Request $request, Server $server, Backup $backup): array
     {
         if (!$request->user()->can(Permission::ACTION_BACKUP_READ, $server)) {
-            throw new UnauthorizedException();
+            throw new AuthorizationException();
         }
 
         return $this->fractal->item($backup)
@@ -130,7 +132,7 @@ public function view(Request $request, Server $server, Backup $backup): array
     public function delete(Request $request, Server $server, Backup $backup): JsonResponse
     {
         if (!$request->user()->can(Permission::ACTION_BACKUP_DELETE, $server)) {
-            throw new UnauthorizedException();
+            throw new AuthorizationException();
         }
 
         $server->audit(AuditLog::SERVER__BACKUP_DELETED, function (AuditLog $audit) use ($backup) {
@@ -146,11 +148,13 @@ public function delete(Request $request, Server $server, Backup $backup): JsonRe
      * Download the backup for a given server instance. For daemon local files, the file
      * will be streamed back through the Panel. For AWS S3 files, a signed URL will be generated
      * which the user is redirected to.
+     *
+     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function download(Request $request, Server $server, Backup $backup): JsonResponse
     {
         if (!$request->user()->can(Permission::ACTION_BACKUP_DOWNLOAD, $server)) {
-            throw new UnauthorizedException();
+            throw new AuthorizationException();
         }
 
         switch ($backup->disk) {
@@ -179,7 +183,7 @@ public function download(Request $request, Server $server, Backup $backup): Json
     public function restore(Request $request, Server $server, Backup $backup): JsonResponse
     {
         if (!$request->user()->can(Permission::ACTION_BACKUP_RESTORE, $server)) {
-            throw new UnauthorizedException();
+            throw new AuthorizationException();
         }
 
         // Cannot restore a backup unless a server is fully installed and not currently

app/Http/Controllers/Api/Client/Servers/BackupController.php

@@ -168,14 +168,6 @@ public function isUniqueUuidCombo(string $uuid, string $short): bool
         return !$this->getBuilder()->where('uuid', '=', $uuid)->orWhere('uuidShort', '=', $short)->exists();
     }
 
-    /**
-     * Get the amount of servers that are suspended.
-     */
-    public function getSuspendedServersCount(): int
-    {
-        return $this->getBuilder()->where('suspended', true)->count();
-    }
-
     /**
      * Returns all of the servers that exist for a given node in a paginated response.
      */

app/Repositories/Eloquent/ServerRepository.php

@@ -30,15 +30,14 @@ public function definition()
             'name' => $this->faker->firstName,
             'description' => implode(' ', $this->faker->sentences()),
             'skip_scripts' => 0,
-            'suspended' => 0,
+            'status' => null,
             'memory' => 512,
             'swap' => 0,
             'disk' => 512,
             'io' => 500,
             'cpu' => 0,
             'threads' => null,
             'oom_disabled' => 0,
-            'installed' => 1,
             'allocation_limit' => null,
             'database_limit' => null,
             'created_at' => Carbon::now(),

database/Factories/ServerFactory.php

@@ -39,11 +39,6 @@ export interface Server {
         allocations: number;
         backups: number;
     };
-    // Only isSuspended got marked as deprecated since the isInstalling is a nice helper
-    // since you'd have to check multiple potential values for that. isSuspended should
-    // be replaced with status !== 'suspended'.
-    /** @deprecated */
-    isSuspended: boolean;
     isInstalling: boolean;
     isTransferring: boolean;
     variables: ServerEggVariable[];
@@ -67,7 +62,6 @@ export const rawDataToServerObject = ({ attributes: data }: FractalResponseData)
     limits: { ...data.limits },
     eggFeatures: data.egg_features || [],
     featureLimits: { ...data.feature_limits },
-    isSuspended: data.status === 'suspended',
     isInstalling: data.status === 'installing' || data.status === 'install_failed',
     isTransferring: data.is_transferring,
     variables: ((data.relationships?.variables as FractalResponseList | undefined)?.data || []).map(rawDataToServerEggVariable),