Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace unique uuid single call

Browse source
This commit is contained in:
Lance Pioch 2022-10-20 20:20:37 -04:00
parent 3e405b626b
commit 679a25a763
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Contracts/Repository/ServerRepositoryInterface.php
View file

@ -51,11 +51,6 @@ interface ServerRepositoryInterface extends RepositoryInterface
*/
public function getByUuid(string $uuid): Server;
/**
* Check if a given UUID and UUID-Short string are unique to a server.
*/
public function isUniqueUuidCombo(string $uuid, string $short): bool;
/**
* Returns all the servers that exist for a given node in a paginated response.
*/

8
app/Repositories/Eloquent/ServerRepository.php
View file

@ -134,14 +134,6 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
}
}
/**
* Check if a given UUID and UUID-Short string are unique to a server.
*/
public function isUniqueUuidCombo(string $uuid, string $short): bool
{
return !$this->getBuilder()->where('uuid', '=', $uuid)->orWhere('uuidShort', '=', $short)->exists();
}
/**
* Returns all the servers that exist for a given node in a paginated response.
*/

3
app/Services/Servers/ServerCreationService.php
View file

@ -206,8 +206,9 @@ class ServerCreationService
private function generateUniqueUuidCombo(): string
{
$uuid = Uuid::uuid4()->toString();
$shortUuid = substr($uuid, 0, 8);
if (!$this->repository->isUniqueUuidCombo($uuid, substr($uuid, 0, 8))) {
if (!Server::query()->where('uuid', $uuid)->orWhere('uuidShort', $shortUuid)->exists()) {
return $this->generateUniqueUuidCombo();
}