refactor service to separate class

Author: SniperSister

app/Jobs/CheckSiteHealth.php

@@ -4,6 +4,7 @@
 
 use App\Enum\HttpMethod;
 use App\Models\Site;
+use App\Services\SiteConnectionService;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
@@ -24,7 +25,10 @@ public function __construct(protected readonly Site $site)
      */
     public function handle(): void
     {
-        $response = $this->site->performWebserviceRequest(
+        /** @var SiteConnectionService $connection */
+        $connection = $this->site->connection;
+
+        $response = $connection->performWebserviceRequest(
             HttpMethod::GET,
             'health.json'
         );

app/Models/Site.php

@@ -2,20 +2,10 @@
 
 namespace App\Models;
 
-use App\Enum\HttpMethod;
-use App\Exceptions\RemotesiteCommunicationException;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\Response;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Facades\App;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
+use App\Services\SiteConnectionService;
+use Illuminate\Database\Eloquent\Model;
 
-class Site extends Authenticatable
+class Site extends Model
 {
     protected $fillable = [
         'url',
@@ -49,71 +39,8 @@ public function getUrlAttribute(string $value): string
         return rtrim($value, "/") . "/";
     }
 
-
-    protected function performRequest(
-        RequestInterface $request,
-        array $options = []
-    ): array {
-        /** @var Client $httpClient */
-        $httpClient = App::make(Client::class);
-
-        /** @var Response $response */
-        $response = $httpClient->send(
-            $request,
-            $options
-        );
-
-        // Validate response
-        if (!json_validate((string) $response->getBody())) {
-            throw new RequestException(
-                "Invalid JSON body",
-                $request,
-                $response
-            );
-        }
-
-        // Return decoded body
-        return json_decode(
-            (string) $response->getBody(),
-            true,
-            512,
-            JSON_THROW_ON_ERROR
-        );
-    }
-
-    public function performExtractionRequest(array $data, string $password): array
+    public function getConnectionAttribute(): SiteConnectionService
     {
-        $request = new Request(
-            'POST',
-            $this->url . 'extract.php'
-        );
-
-        $data['password'] = $password;
-
-        return $this->performRequest(
-            $request,
-            [
-                'form_params' => $data,
-                'timeout' => 300.0
-            ]
-        );
-    }
-
-    public function performWebserviceRequest(HttpMethod $method, string $endpoint, array $data = []): array
-    {
-        $request = new Request(
-            $method->name,
-            $this->url . $endpoint,
-            [
-                'Authorization' => 'JUpdate-Token ' . $this->key
-            ]
-        );
-
-        return $this->performRequest(
-            $request,
-            [
-                "json" => $data
-            ]
-        );
+        return new SiteConnectionService($this->url, $this->key);
     }
 }

app/Services/SiteConnectionService.php

@@ -0,0 +1,85 @@
+<?php declare(strict_types=1);
+
+namespace App\Services;
+
+use App\Enum\HttpMethod;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+use Illuminate\Support\Facades\App;
+use Psr\Http\Message\RequestInterface;
+
+class SiteConnectionService
+{
+    public function __construct(protected readonly string $baseUrl, protected readonly string $key)
+    {
+    }
+
+    protected function performRequest(
+        RequestInterface $request,
+        array $options = []
+    ): array {
+        /** @var Client $httpClient */
+        $httpClient = App::make(Client::class);
+
+        /** @var Response $response */
+        $response = $httpClient->send(
+            $request,
+            $options
+        );
+
+        // Validate response
+        if (!json_validate((string) $response->getBody())) {
+            throw new RequestException(
+                "Invalid JSON body",
+                $request,
+                $response
+            );
+        }
+
+        // Return decoded body
+        return json_decode(
+            (string) $response->getBody(),
+            true,
+            512,
+            JSON_THROW_ON_ERROR
+        );
+    }
+
+    public function performExtractionRequest(array $data): array
+    {
+        $request = new Request(
+            'POST',
+            $this->baseUrl . 'extract.php'
+        );
+
+        $data['password'] = $this->key;
+
+        return $this->performRequest(
+            $request,
+            [
+                'form_params' => $data,
+                'timeout' => 300.0
+            ]
+        );
+    }
+
+    public function performWebserviceRequest(HttpMethod $method, string $endpoint, array $data = []): array
+    {
+        $request = new Request(
+            $method->name,
+            $this->baseUrl . $endpoint,
+            [
+                'Authorization' => 'JUpdate-Token ' . $this->key
+            ]
+        );
+
+        return $this->performRequest(
+            $request,
+            [
+                "json" => $data
+            ]
+        );
+    }
+}