refactor traits with package's HttpClientException.php

Author: MusahMusah

src/Exceptions/HttpClientException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace MusahMusah\LaravelMultipaymentGateways\Exceptions;
+
+use Exception;
+
+class HttpClientException extends Exception
+{
+    protected $message = 'An error occurred while sending the request to the payment gateway';
+}

src/Traits/ConsumesExternalServices.php

@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use MusahMusah\LaravelMultipaymentGateways\Exceptions\HttpClientException;
 use MusahMusah\LaravelMultipaymentGateways\Exceptions\HttpMethodFoundException;
 
 trait ConsumesExternalServices
@@ -16,8 +17,7 @@ trait ConsumesExternalServices
     /**
      * Send a request to any service.
      *
-     *
-     * @throws GuzzleException|HttpMethodFoundException
+     * @throws GuzzleException|HttpMethodFoundException|HttpClientException
      */
     public function makeRequest(string $method, string $requestUrl, array|string $formParams = [], bool $isJsonRequest = false, array $queryParams = [], array $headers = [], bool $skipResolve = false): mixed
     {
@@ -31,15 +31,19 @@ public function makeRequest(string $method, string $requestUrl, array|string $fo
             $this->resolveAuthorization($queryParams, $formParams, $headers);
         }
 
-        $response = $client->request($method, $requestUrl, [
-            $isJsonRequest ? 'json' : 'form_params' => $formParams,
-            'headers' => [
-                ...$headers,
-                'Content-Type' => $isJsonRequest ? 'application/json' : 'application/x-www-form-urlencoded',
-                'Accept' => 'application/json',
-            ],
-            'query' => $queryParams,
-        ]);
+        try {
+            $response = $client->request($method, $requestUrl, [
+                $isJsonRequest ? 'json' : 'form_params' => $formParams,
+                'headers' => [
+                    ...$headers,
+                    'Content-Type' => $isJsonRequest ? 'application/json' : 'application/x-www-form-urlencoded',
+                    'Accept' => 'application/json',
+                ],
+                'query' => $queryParams,
+            ]);
+        } catch (GuzzleException $e) {
+            throw new HttpClientException($e->getMessage());
+        }
 
         $this->response = $response->getBody()->getContents();
 
@@ -55,7 +59,7 @@ public function makeRequest(string $method, string $requestUrl, array|string $fo
      */
     private function validateRequest(string $method): void
     {
-        if (! in_array($method, ['GET', 'POST', 'PUT', 'DELETE'])) {
+        if (! in_array($method, ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'])) {
             throw new HttpMethodFoundException('Method not found');
         }
     }