diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php index 73ba193e1..ce088cc57 100644 --- a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php +++ b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php @@ -2,6 +2,9 @@ namespace App\Http\Controllers\Api\Remote\Servers; +use App\Models\Server; +use App\Repositories\Daemon\DaemonRepository; +use GuzzleHttp\Exception\GuzzleException; use Illuminate\Http\Response; use Illuminate\Http\JsonResponse; use App\Models\Allocation; @@ -10,7 +13,7 @@ use App\Models\ServerTransfer; use Illuminate\Database\ConnectionInterface; use App\Http\Controllers\Controller; use App\Repositories\Eloquent\ServerRepository; -use App\Repositories\Daemon\DaemonServerRepository; +use Lcobucci\JWT\Token\Plain; use Symfony\Component\HttpKernel\Exception\ConflictHttpException; use App\Exceptions\Http\Connection\DaemonConnectionException; @@ -22,10 +25,29 @@ class ServerTransferController extends Controller public function __construct( private ConnectionInterface $connection, private ServerRepository $repository, - private DaemonServerRepository $daemonServerRepository + private DaemonRepository $daemonRepository, ) { } + private function notify(DaemonRepository $repository, Server $server, Plain $token): void + { + try { + $repository->getHttpClient()->post('/api/transfer', [ + 'json' => [ + 'server_id' => $server->uuid, + 'url' => $server->node->getConnectionAddress() . "/api/servers/$server->uuid/archive", + 'token' => 'Bearer ' . $token->toString(), + 'server' => [ + 'uuid' => $server->uuid, + 'start_on_completion' => false, + ], + ], + ]); + } catch (GuzzleException $exception) { + throw new DaemonConnectionException($exception); + } + } + /** * The daemon notifies us about a transfer failure. * diff --git a/app/Repositories/Daemon/DaemonTransferRepository.php b/app/Repositories/Daemon/DaemonTransferRepository.php deleted file mode 100644 index 95a7a77de..000000000 --- a/app/Repositories/Daemon/DaemonTransferRepository.php +++ /dev/null @@ -1,33 +0,0 @@ -getHttpClient()->post(sprintf('/api/servers/%s/transfer', $this->server->uuid), [ - 'json' => [ - 'server_id' => $this->server->uuid, - 'url' => $targetNode->getConnectionAddress() . '/api/transfers', - 'token' => 'Bearer ' . $token->toString(), - 'server' => [ - 'uuid' => $this->server->uuid, - 'start_on_completion' => false, - ], - ], - ]); - } catch (GuzzleException $exception) { - throw new DaemonConnectionException($exception); - } - } -} diff --git a/phpstan.neon b/phpstan.neon index 6096d6449..66a52549f 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,7 +7,7 @@ parameters: - app/ # Level 9 is the highest level - level: 1 + level: 2 # ignoreErrors: # - '#PHPDoc tag @var#'