From 22d02c0df5adab9431e137ea323035d645c9c01f Mon Sep 17 00:00:00 2001
From: MartinOscar <40749467+rmartinoscar@users.noreply.github.com>
Date: Mon, 17 Mar 2025 05:46:33 +0100
Subject: [PATCH] Remove `NodeCreationService` (#1092)

---
 app/Console/Commands/Node/MakeNodeCommand.php | 12 ++------
 .../Api/Application/Nodes/NodeController.php  |  4 +--
 app/Services/Nodes/NodeCreationService.php    | 28 -------------------
 3 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 app/Services/Nodes/NodeCreationService.php

diff --git a/app/Console/Commands/Node/MakeNodeCommand.php b/app/Console/Commands/Node/MakeNodeCommand.php
index fc22f87aa..2d3678a79 100644
--- a/app/Console/Commands/Node/MakeNodeCommand.php
+++ b/app/Console/Commands/Node/MakeNodeCommand.php
@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands\Node;
 
+use App\Models\Node;
 use Illuminate\Console\Command;
-use App\Services\Nodes\NodeCreationService;
 
 class MakeNodeCommand extends Command
 {
@@ -30,14 +30,6 @@ class MakeNodeCommand extends Command
 
     protected $description = 'Creates a new node on the system via the CLI.';
 
-    /**
-     * MakeNodeCommand constructor.
-     */
-    public function __construct(private NodeCreationService $creationService)
-    {
-        parent::__construct();
-    }
-
     /**
      * Handle the command execution process.
      *
@@ -69,7 +61,7 @@ class MakeNodeCommand extends Command
         $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(trans('commands.make_node.daemonSFTPAlias'), '');
         $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(trans('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
 
-        $node = $this->creationService->handle($data);
+        $node = Node::create($data);
         $this->line(trans('commands.make_node.success', ['name' => $data['name'], 'id' => $node->id]));
     }
 }
diff --git a/app/Http/Controllers/Api/Application/Nodes/NodeController.php b/app/Http/Controllers/Api/Application/Nodes/NodeController.php
index 5c69b14bb..bd6a3d274 100644
--- a/app/Http/Controllers/Api/Application/Nodes/NodeController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/NodeController.php
@@ -6,7 +6,6 @@ use App\Models\Node;
 use Illuminate\Http\JsonResponse;
 use Spatie\QueryBuilder\QueryBuilder;
 use App\Services\Nodes\NodeUpdateService;
-use App\Services\Nodes\NodeCreationService;
 use App\Services\Nodes\NodeDeletionService;
 use App\Transformers\Api\Application\NodeTransformer;
 use App\Http\Requests\Api\Application\Nodes\GetNodeRequest;
@@ -24,7 +23,6 @@ class NodeController extends ApplicationApiController
      * NodeController constructor.
      */
     public function __construct(
-        private NodeCreationService $creationService,
         private NodeDeletionService $deletionService,
         private NodeUpdateService $updateService
     ) {
@@ -74,7 +72,7 @@ class NodeController extends ApplicationApiController
      */
     public function store(StoreNodeRequest $request): JsonResponse
     {
-        $node = $this->creationService->handle($request->validated());
+        $node = Node::create($request->validated());
 
         return $this->fractal->item($node)
             ->transformWith($this->getTransformer(NodeTransformer::class))
diff --git a/app/Services/Nodes/NodeCreationService.php b/app/Services/Nodes/NodeCreationService.php
deleted file mode 100644
index cbd89d277..000000000
--- a/app/Services/Nodes/NodeCreationService.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Services\Nodes;
-
-use Ramsey\Uuid\Uuid;
-use Illuminate\Support\Str;
-use App\Models\Node;
-
-class NodeCreationService
-{
-    /**
-     * Create a new node on the panel.
-     *
-     * @todo remove this class
-     *
-     * @param  array<string, mixed>  $data
-     *
-     * @throws \App\Exceptions\Model\DataValidationException
-     */
-    public function handle(array $data): Node
-    {
-        $data['uuid'] = Uuid::uuid4()->toString();
-        $data['daemon_token'] = Str::random(Node::DAEMON_TOKEN_LENGTH);
-        $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);
-
-        return Node::query()->create($data);
-    }
-}