Merge branch 'develop' into pr/2454

Author: DaneEveritt

app/Contracts/Repository/DatabaseRepositoryInterface.php

@@ -42,18 +42,6 @@ public function getDatabasesForServer(int $server): Collection;
      */
     public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
 
-    /**
-     * Create a new database if it does not already exist on the host with
-     * the provided details.
-     *
-     * @param array $data
-     * @return \Pterodactyl\Models\Database
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException
-     */
-    public function createIfNotExists(array $data): Database;
-
     /**
      * Create a new database on a given connection.
      *

app/Contracts/Repository/NodeRepositoryInterface.php

@@ -54,15 +54,4 @@ public function loadNodeAllocations(Node $node, bool $refresh = false): Node;
      * @return \Illuminate\Support\Collection
      */
     public function getNodesForServerCreation(): Collection;
-
-    /**
-     * Return the IDs of all nodes that exist in the provided locations and have the space
-     * available to support the additional disk and memory provided.
-     *
-     * @param array $locations
-     * @param int $disk
-     * @param int $memory
-     * @return \Illuminate\Support\LazyCollection
-     */
-    public function getNodesWithResourceUse(array $locations, int $disk, int $memory): LazyCollection;
 }

app/Http/Controllers/Admin/MountController.php

@@ -102,9 +102,11 @@ public function view($id)
     public function create(MountFormRequest $request)
     {
         /** @var \Pterodactyl\Models\Mount $mount */
-        $mount = Mount::query()->create(array_merge($request->validated(), [
-            'uuid' => Uuid::uuid4()->toString(),
-        ]));
+        $model = (new Mount())->fill($request->validated());
+        $model->forceFill(['uuid' => Uuid::uuid4()->toString()]);
+
+        $model->saveOrFail();
+        $mount = $model->fresh();
 
         $this->alert->success('Mount was created successfully.')->flash();
 

app/Http/Controllers/Admin/Nests/EggScriptController.php

@@ -1,15 +1,9 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Http\Controllers\Admin\Nests;
 
 use Illuminate\View\View;
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
@@ -81,14 +75,14 @@ public function index(int $egg): View
      * Handle a request to update the installation script for an Egg.
      *
      * @param \Pterodactyl\Http\Requests\Admin\Egg\EggScriptFormRequest $request
-     * @param int $egg
+     * @param \Pterodactyl\Models\Egg $egg
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException
      */
-    public function update(EggScriptFormRequest $request, int $egg): RedirectResponse
+    public function update(EggScriptFormRequest $request, Egg $egg): RedirectResponse
     {
         $this->installScriptService->handle($egg, $request->normalize());
         $this->alert->success(trans('admin/nests.eggs.notices.script_updated'))->flash();

app/Http/Controllers/Admin/Nests/EggShareController.php

@@ -102,15 +102,15 @@ public function import(EggImportFormRequest $request): RedirectResponse
      * Update an existing Egg using a new imported file.
      *
      * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request
-     * @param int $egg
+     * @param \Pterodactyl\Models\Egg $egg
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
      * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
-    public function update(EggImportFormRequest $request, int $egg): RedirectResponse
+    public function update(EggImportFormRequest $request, Egg $egg): RedirectResponse
     {
         $this->updateImporterService->handle($egg, $request->file('import_file'));
         $this->alert->success(trans('admin/nests.eggs.notices.updated_via_import'))->flash();

app/Http/Controllers/Admin/ServersController.php

@@ -252,7 +252,7 @@ public function toggleInstall(Server $server)
      */
     public function reinstallServer(Server $server)
     {
-        $this->reinstallService->reinstall($server);
+        $this->reinstallService->handle($server);
         $this->alert->success(trans('admin/server.alerts.server_reinstalled'))->flash();
 
         return redirect()->route('admin.servers.view.manage', $server->id);
@@ -362,7 +362,7 @@ public function saveStartup(Request $request, Server $server)
     public function newDatabase(StoreServerDatabaseRequest $request, Server $server)
     {
         $this->databaseManagementService->create($server, [
-            'database' => $request->input('database'),
+            'database' => DatabaseManagementService::generateUniqueDatabaseName($request->input('database'), $server->id),
             'remote' => $request->input('remote'),
             'database_host_id' => $request->input('database_host_id'),
             'max_connections' => $request->input('max_connections'),
@@ -409,7 +409,7 @@ public function deleteDatabase($server, $database)
             ['id', '=', $database],
         ]);
 
-        $this->databaseManagementService->delete($database->id);
+        $this->databaseManagementService->delete($database);
 
         return response('', 204);
     }

app/Http/Controllers/Admin/UserController.php

@@ -86,8 +86,8 @@ public function index(Request $request)
     {
         $users = QueryBuilder::for(
             User::query()->select('users.*')
-                ->selectRaw('COUNT(subusers.id) as subuser_of_count')
-                ->selectRaw('COUNT(servers.id) as servers_count')
+                ->selectRaw('COUNT(DISTINCT(subusers.id)) as subuser_of_count')
+                ->selectRaw('COUNT(DISTINCT(servers.id)) as servers_count')
                 ->leftJoin('subusers', 'subusers.user_id', '=', 'users.id')
                 ->leftJoin('servers', 'servers.owner_id', '=', 'users.id')
                 ->groupBy('users.id')

app/Http/Controllers/Api/Application/Servers/DatabaseController.php

@@ -110,7 +110,9 @@ public function resetPassword(ServerDatabaseWriteRequest $request, Server $serve
      */
     public function store(StoreServerDatabaseRequest $request, Server $server): JsonResponse
     {
-        $database = $this->databaseManagementService->create($server, $request->validated());
+        $database = $this->databaseManagementService->create($server, array_merge($request->validated(), [
+            'database' => $request->databaseName(),
+        ]));
 
         return $this->fractal->item($database)
             ->transformWith($this->getTransformer(ServerDatabaseTransformer::class))
@@ -133,7 +135,7 @@ public function store(StoreServerDatabaseRequest $request, Server $server): Json
      */
     public function delete(ServerDatabaseWriteRequest $request): Response
     {
-        $this->databaseManagementService->delete($request->getModel(Database::class)->id);
+        $this->databaseManagementService->delete($request->getModel(Database::class));
 
         return response('', 204);
     }

app/Http/Controllers/Api/Application/Servers/ServerManagementController.php

@@ -82,7 +82,7 @@ public function unsuspend(ServerWriteRequest $request, Server $server): Response
      */
     public function reinstall(ServerWriteRequest $request, Server $server): Response
     {
-        $this->reinstallServerService->reinstall($server);
+        $this->reinstallServerService->handle($server);
 
         return $this->returnNoContent();
     }

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

@@ -129,7 +129,7 @@ public function rotatePassword(RotatePasswordRequest $request, Server $server, D
      */
     public function delete(DeleteDatabaseRequest $request, Server $server, Database $database): Response
     {
-        $this->managementService->delete($database->id);
+        $this->managementService->delete($database);
 
         return Response::create('', Response::HTTP_NO_CONTENT);
     }