Replace node repository

2022-10-23 22:17:24 -04:00 · 2022-10-23 22:17:24 -04:00 · aeb7590a6d
commit aeb7590a6d
parent 7266c66ebf
14 changed files with 101 additions and 250 deletions
--- a/app/Http/Controllers/Admin/Nodes/NodeViewController.php
+++ b/app/Http/Controllers/Admin/Nodes/NodeViewController.php
@ -9,7 +9,6 @@ use Illuminate\Support\Collection;
 use Pterodactyl\Models\Allocation;
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Contracts\View\Factory as ViewFactory;
-use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Traits\Controllers\JavascriptInjection;
 use Pterodactyl\Services\Helpers\SoftwareVersionService;
@ -26,7 +25,6 @@ class NodeViewController extends Controller
    public function __construct(
        private AllocationRepository $allocationRepository,
        private LocationRepository $locationRepository,
-        private NodeRepository $repository,
        private ServerRepository $serverRepository,
        private SoftwareVersionService $versionService,
        private ViewFactory $view
@ -38,11 +36,37 @@ class NodeViewController extends Controller
     */
    public function index(Request $request, Node $node): View
    {
-        $node = $this->repository->loadLocationAndServerCount($node);
+        $node->load('location')->loadCount('servers');
+
+        $stats = Node::query()
+            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
+            ->join('servers', 'servers.node_id', '=', 'nodes.id')
+            ->where('node_id', '=', $node->id)
+            ->first();
+
+        $usageStats = Collection::make(['disk' => $stats->sum_disk, 'memory' => $stats->sum_memory])
+            ->mapWithKeys(function ($value, $key) use ($node) {
+                $maxUsage = $node->{$key};
+                if ($node->{$key . '_overallocate'} > 0) {
+                    $maxUsage = $node->{$key} * (1 + ($node->{$key . '_overallocate'} / 100));
+                }
+
+                $percent = ($value / $maxUsage) * 100;
+
+                return [
+                    $key => [
+                        'value' => number_format($value),
+                        'max' => number_format($maxUsage),
+                        'percent' => $percent,
+                        'css' => ($percent <= self::THRESHOLD_PERCENTAGE_LOW) ? 'green' : (($percent > self::THRESHOLD_PERCENTAGE_MEDIUM) ? 'red' : 'yellow'),
+                    ],
+                ];
+            })
+            ->toArray();

        return $this->view->make('admin.nodes.view.index', [
            'node' => $node,
-            'stats' => $this->repository->getUsageStats($node),
+            'stats' => $usageStats,
            'version' => $this->versionService,
        ]);
    }
@ -71,7 +95,15 @@ class NodeViewController extends Controller
     */
    public function allocations(Request $request, Node $node): View
    {
-        $node = $this->repository->loadNodeAllocations($node);
+        $node->setRelation(
+            'allocations',
+            $node->allocations()
+                ->orderByRaw('server_id IS NOT NULL DESC, server_id IS NULL')
+                ->orderByRaw('INET_ATON(ip) ASC')
+                ->orderBy('port')
+                ->with('server:id,name')
+                ->paginate(50)
+        );

        $this->plainInject(['node' => Collection::wrap($node)->only(['id'])]);

--- a/app/Http/Controllers/Admin/NodesController.php
+++ b/app/Http/Controllers/Admin/NodesController.php
@ -18,7 +18,6 @@ use Pterodactyl\Services\Nodes\NodeDeletionService;
 use Pterodactyl\Services\Allocations\AssignmentService;
 use Pterodactyl\Services\Helpers\SoftwareVersionService;
 use Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest;
-use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Http\Requests\Admin\Node\AllocationFormRequest;
 use Pterodactyl\Services\Allocations\AllocationDeletionService;
@ -40,7 +39,6 @@ class NodesController extends Controller
        protected NodeCreationService $creationService,
        protected NodeDeletionService $deletionService,
        protected LocationRepositoryInterface $locationRepository,
-        protected NodeRepositoryInterface $repository,
        protected ServerRepositoryInterface $serverRepository,
        protected NodeUpdateService $updateService,
        protected SoftwareVersionService $versionService,
--- a/app/Http/Controllers/Admin/Servers/CreateServerController.php
+++ b/app/Http/Controllers/Admin/Servers/CreateServerController.php
@ -11,7 +11,6 @@ use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\View\Factory as ViewFactory;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\Eloquent\NestRepository;
-use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
 use Pterodactyl\Services\Servers\ServerCreationService;

@ -23,7 +22,6 @@ class CreateServerController extends Controller
    public function __construct(
        private AlertsMessageBag $alert,
        private NestRepository $nestRepository,
-        private NodeRepository $nodeRepository,
        private ServerCreationService $creationService,
        private ViewFactory $view
    ) {
@ -46,7 +44,7 @@ class CreateServerController extends Controller
        $nests = $this->nestRepository->getWithEggs();

        JavaScript::put([
-            'nodeData' => $this->nodeRepository->getNodesForServerCreation(),
+            'nodeData' => Node::getForServerCreation(),
            'nests' => $nests->map(function ($item) {
                return array_merge($item->toArray(), [
                    'eggs' => $item->eggs->keyBy('id')->toArray(),
--- a/app/Http/Controllers/Admin/Servers/ServerTransferController.php
+++ b/app/Http/Controllers/Admin/Servers/ServerTransferController.php
@ -3,13 +3,13 @@
 namespace Pterodactyl\Http\Controllers\Admin\Servers;

 use Illuminate\Http\Request;
+use Pterodactyl\Models\Node;
 use Pterodactyl\Models\Server;
 use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\Http\RedirectResponse;
 use Pterodactyl\Models\ServerTransfer;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Servers\TransferService;
-use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Wings\DaemonConfigurationRepository;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;

@ -21,7 +21,6 @@ class ServerTransferController extends Controller
    public function __construct(
        private AlertsMessageBag $alert,
        private AllocationRepositoryInterface $allocationRepository,
-        private NodeRepository $nodeRepository,
        private TransferService $transferService,
        private DaemonConfigurationRepository $daemonConfigurationRepository
    ) {
@ -45,7 +44,13 @@ class ServerTransferController extends Controller
        $additional_allocations = array_map('intval', $validatedData['allocation_additional'] ?? []);

        // Check if the node is viable for the transfer.
-        $node = $this->nodeRepository->getNodeWithResourceUsage($node_id);
+        $node = Node::query()
+            ->select(['nodes.id', 'nodes.fqdn', 'nodes.scheme', 'nodes.daemon_token', 'nodes.daemonListen', 'nodes.memory', 'nodes.disk', 'nodes.memory_overallocate', 'nodes.disk_overallocate'])
+            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
+            ->leftJoin('servers', 'servers.node_id', '=', 'nodes.id')
+            ->where('nodes.id', $node_id)
+            ->first();
+
        if ($node->isViable($server->memory, $server->disk)) {
            // Check if the selected daemon is online.
            $this->daemonConfigurationRepository->setNode($node)->getSystemInformation();
--- a/app/Http/Controllers/Admin/Servers/ServerViewController.php
+++ b/app/Http/Controllers/Admin/Servers/ServerViewController.php
@ -6,13 +6,13 @@ use JavaScript;
 use Illuminate\View\View;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Nest;
+use Pterodactyl\Models\Node;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Servers\EnvironmentService;
 use Illuminate\Contracts\View\Factory as ViewFactory;
 use Pterodactyl\Repositories\Eloquent\NestRepository;
-use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\MountRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Traits\Controllers\JavascriptInjection;
@ -31,7 +31,6 @@ class ServerViewController extends Controller
        private LocationRepository $locationRepository,
        private MountRepository $mountRepository,
        private NestRepository $nestRepository,
-        private NodeRepository $nodeRepository,
        private ServerRepository $repository,
        private EnvironmentService $environmentService,
        private ViewFactory $view
@ -128,14 +127,14 @@ class ServerViewController extends Controller
        }

        // Check if the panel doesn't have at least 2 nodes configured.
-        $nodes = $this->nodeRepository->all();
+        $nodeCount = Node::query()->count();
        $canTransfer = false;
-        if (count($nodes) >= 2) {
+        if ($nodeCount >= 2) {
            $canTransfer = true;
        }

        JavaScript::put([
-            'nodeData' => $this->nodeRepository->getNodesForServerCreation(),
+            'nodeData' => Node::getForServerCreation(),
        ]);

        return $this->view->make('admin.servers.view.manage', [