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

Replace DatabaseHost Repository

Browse source
This commit is contained in:
Lance Pioch 2022-10-23 02:14:54 -04:00
parent 860b2d890b
commit 9001755e10
10 changed files with 29 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/Services/Databases/Hosts/HostCreationService.php
View file

@ -7,7 +7,6 @@ use Illuminate\Database\DatabaseManager;
use Illuminate\Database\ConnectionInterface;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Extensions\DynamicDatabaseConnection;
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
class HostCreationService
{
@ -18,8 +17,7 @@ class HostCreationService
private ConnectionInterface $connection,
private DatabaseManager $databaseManager,
private DynamicDatabaseConnection $dynamic,
private Encrypter $encrypter,
private DatabaseHostRepositoryInterface $repository
private Encrypter $encrypter
) {
}
@ -31,7 +29,8 @@ class HostCreationService
public function handle(array $data): DatabaseHost
{
return $this->connection->transaction(function () use ($data) {
$host = $this->repository->create([
/** @var DatabaseHost $host */
$host = DatabaseHost::query()->create([
'password' => $this->encrypter->encrypt(array_get($data, 'password')),
'name' => array_get($data, 'name'),
'host' => array_get($data, 'host'),

14
app/Services/Databases/Hosts/HostDeletionService.php
View file

@ -2,9 +2,9 @@
namespace Pterodactyl\Services\Databases\Hosts;
use Pterodactyl\Models\DatabaseHost;
use Pterodactyl\Exceptions\Service\HasActiveServersException;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
class HostDeletionService
{
@ -12,8 +12,7 @@ class HostDeletionService
* HostDeletionService constructor.
*/
public function __construct(
private DatabaseRepositoryInterface $databaseRepository,
private DatabaseHostRepositoryInterface $repository
private DatabaseRepositoryInterface $databaseRepository
) {
}
@ -21,7 +20,7 @@ class HostDeletionService
* Delete a specified host from the Panel if no databases are
* attached to it.
*
* @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
* @throws HasActiveServersException
*/
public function handle(int $host): int
{
@ -30,6 +29,11 @@ class HostDeletionService
throw new HasActiveServersException(trans('exceptions.databases.delete_has_databases'));
}
return $this->repository->delete($host);
$host = DatabaseHost::query()->find($host);
if ($host) {
return $host->delete();
}
return true;
}
}

8
app/Services/Databases/Hosts/HostUpdateService.php
View file

@ -7,7 +7,6 @@ use Illuminate\Database\DatabaseManager;
use Illuminate\Database\ConnectionInterface;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Extensions\DynamicDatabaseConnection;
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
class HostUpdateService
{
@ -18,8 +17,7 @@ class HostUpdateService
private ConnectionInterface $connection,
private DatabaseManager $databaseManager,
private DynamicDatabaseConnection $dynamic,
private Encrypter $encrypter,
private DatabaseHostRepositoryInterface $repository
private Encrypter $encrypter
) {
}
@ -37,7 +35,9 @@ class HostUpdateService
}
return $this->connection->transaction(function () use ($data, $hostId) {
$host = $this->repository->update($hostId, $data);
/** @var DatabaseHost $host */
$host = DatabaseHost::query()->findOrFail($hostId);
$host->update($data);
$this->dynamic->set('dynamic', $host);
$this->databaseManager->connection('dynamic')->select('SELECT 1 FROM dual');