Replace unique uuid single call
This commit is contained in:
parent
3e405b626b
commit
679a25a763
3 changed files with 2 additions and 14 deletions
|
@ -51,11 +51,6 @@ interface ServerRepositoryInterface extends RepositoryInterface
|
||||||
*/
|
*/
|
||||||
public function getByUuid(string $uuid): Server;
|
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.
|
* Returns all the servers that exist for a given node in a paginated response.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -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.
|
* Returns all the servers that exist for a given node in a paginated response.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -206,8 +206,9 @@ class ServerCreationService
|
||||||
private function generateUniqueUuidCombo(): string
|
private function generateUniqueUuidCombo(): string
|
||||||
{
|
{
|
||||||
$uuid = Uuid::uuid4()->toString();
|
$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();
|
return $this->generateUniqueUuidCombo();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue