Small fixes

This commit is contained in:
Lance Pioch 2024-03-16 19:28:31 -04:00
parent 191e0adc58
commit 666634ae88
4 changed files with 3 additions and 5 deletions

View File

@ -91,7 +91,7 @@ class NodeViewController extends Controller
return $this->view->make('admin.nodes.view.servers', [ return $this->view->make('admin.nodes.view.servers', [
'node' => $node, 'node' => $node,
'servers' => $node->servers()->with(['user', 'nest', 'egg'])->paginate(25), 'servers' => $node->servers()->with(['user', 'egg'])->paginate(25),
]); ]);
} }
} }

View File

@ -28,7 +28,7 @@ class ServerInstallController extends Controller
*/ */
public function index(Request $request, string $uuid): JsonResponse public function index(Request $request, string $uuid): JsonResponse
{ {
$server = $this->repository->getByUuid($uuid); $server = Server::findOrFailByUuid($uuid);
$egg = $server->egg; $egg = $server->egg;
return new JsonResponse([ return new JsonResponse([

View File

@ -363,7 +363,7 @@ class Server extends Model
public static function findOrFailByUuid(string $uuid): Server public static function findOrFailByUuid(string $uuid): Server
{ {
/** @var Server $server */ /** @var Server $server */
$server = Server::with(['nest', 'node']) $server = Server::with(['node'])
->where('uuidShort', $uuid) ->where('uuidShort', $uuid)
->orWhere('uuid', $uuid) ->orWhere('uuid', $uuid)
->firstOrFail(); ->firstOrFail();

View File

@ -9,7 +9,6 @@ use App\Models\Subuser;
use Illuminate\Database\ConnectionInterface; use Illuminate\Database\ConnectionInterface;
use App\Services\Users\UserCreationService; use App\Services\Users\UserCreationService;
use App\Repositories\Eloquent\SubuserRepository; use App\Repositories\Eloquent\SubuserRepository;
use App\Exceptions\Repository\RecordNotFoundException;
use App\Exceptions\Service\Subuser\UserIsServerOwnerException; use App\Exceptions\Service\Subuser\UserIsServerOwnerException;
use App\Exceptions\Service\Subuser\ServerSubuserExistsException; use App\Exceptions\Service\Subuser\ServerSubuserExistsException;
@ -22,7 +21,6 @@ class SubuserCreationService
private ConnectionInterface $connection, private ConnectionInterface $connection,
private SubuserRepository $subuserRepository, private SubuserRepository $subuserRepository,
private UserCreationService $userCreationService, private UserCreationService $userCreationService,
private UserRepositoryInterface $userRepository
) { ) {
} }