From 22d560de64a3a13065662807535f28c0ed012bd5 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Thu, 20 Oct 2022 20:25:49 -0400 Subject: [PATCH] Remove all of these, none of them are used --- .../Repository/ServerRepositoryInterface.php | 38 -------- .../Eloquent/ServerRepository.php | 94 ------------------- 2 files changed, 132 deletions(-) diff --git a/app/Contracts/Repository/ServerRepositoryInterface.php b/app/Contracts/Repository/ServerRepositoryInterface.php index cdd7e0ae1..20e36a17f 100644 --- a/app/Contracts/Repository/ServerRepositoryInterface.php +++ b/app/Contracts/Repository/ServerRepositoryInterface.php @@ -3,47 +3,9 @@ namespace Pterodactyl\Contracts\Repository; use Pterodactyl\Models\Server; -use Illuminate\Support\Collection; -use Illuminate\Contracts\Pagination\LengthAwarePaginator; interface ServerRepositoryInterface extends RepositoryInterface { - /** - * Return a collection of servers with their associated data for rebuild operations. - */ - public function getDataForRebuild(int $server = null, int $node = null): Collection; - - /** - * Return a collection of servers with their associated data for reinstall operations. - */ - public function getDataForReinstall(int $server = null, int $node = null): Collection; - - /** - * Return a server model and all variables associated with the server. - * - * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException - */ - public function findWithVariables(int $id): Server; - - /** - * Get the primary allocation for a given server. If a model is passed into - * the function, load the allocation relationship onto it. Otherwise, find and - * return the server from the database. - */ - public function getPrimaryAllocation(Server $server, bool $refresh = false): Server; - - /** - * Return enough data to be used for the creation of a server via the daemon. - */ - public function getDataForCreation(Server $server, bool $refresh = false): Server; - - /** - * Get data for use when updating a server on the Daemon. Returns an array of - * the egg which is used for build and rebuild. Only loads relations - * if they are missing, or refresh is set to true. - */ - public function getDaemonServiceData(Server $server, bool $refresh = false): array; - /** * Return a server by UUID. * diff --git a/app/Repositories/Eloquent/ServerRepository.php b/app/Repositories/Eloquent/ServerRepository.php index c5b3435f2..e87ec875e 100644 --- a/app/Repositories/Eloquent/ServerRepository.php +++ b/app/Repositories/Eloquent/ServerRepository.php @@ -3,10 +3,8 @@ namespace Pterodactyl\Repositories\Eloquent; use Pterodactyl\Models\Server; -use Illuminate\Support\Collection; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Pterodactyl\Exceptions\Repository\RecordNotFoundException; use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; @@ -20,98 +18,6 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt return Server::class; } - /** - * Return a collection of servers with their associated data for rebuild operations. - */ - public function getDataForRebuild(int $server = null, int $node = null): Collection - { - $instance = $this->getBuilder()->with(['allocation', 'allocations', 'egg', 'node']); - - if (!is_null($server) && is_null($node)) { - $instance = $instance->where('id', '=', $server); - } elseif (is_null($server) && !is_null($node)) { - $instance = $instance->where('node_id', '=', $node); - } - - return $instance->get($this->getColumns()); - } - - /** - * Return a collection of servers with their associated data for reinstall operations. - */ - public function getDataForReinstall(int $server = null, int $node = null): Collection - { - $instance = $this->getBuilder()->with(['allocation', 'allocations', 'egg', 'node']); - - if (!is_null($server) && is_null($node)) { - $instance = $instance->where('id', '=', $server); - } elseif (is_null($server) && !is_null($node)) { - $instance = $instance->where('node_id', '=', $node); - } - - return $instance->get($this->getColumns()); - } - - /** - * Return a server model and all variables associated with the server. - * - * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException - */ - public function findWithVariables(int $id): Server - { - try { - return $this->getBuilder()->with('egg.variables', 'variables') - ->where($this->getModel()->getKeyName(), '=', $id) - ->firstOrFail($this->getColumns()); - } catch (ModelNotFoundException) { - throw new RecordNotFoundException(); - } - } - - /** - * Get the primary allocation for a given server. If a model is passed into - * the function, load the allocation relationship onto it. Otherwise, find and - * return the server from the database. - */ - public function getPrimaryAllocation(Server $server, bool $refresh = false): Server - { - if (!$server->relationLoaded('allocation') || $refresh) { - $server->load('allocation'); - } - - return $server; - } - - /** - * Return enough data to be used for the creation of a server via the daemon. - */ - public function getDataForCreation(Server $server, bool $refresh = false): Server - { - foreach (['allocation', 'allocations', 'egg'] as $relation) { - if (!$server->relationLoaded($relation) || $refresh) { - $server->load($relation); - } - } - - return $server; - } - - /** - * Get data for use when updating a server on the Daemon. Returns an array of - * the egg which is used for build and rebuild. Only loads relations - * if they are missing, or refresh is set to true. - */ - public function getDaemonServiceData(Server $server, bool $refresh = false): array - { - if (!$server->relationLoaded('egg') || $refresh) { - $server->load('egg'); - } - - return [ - 'egg' => $server->getRelation('egg')->uuid, - ]; - } - /** * Return a server by UUID. *