Revert "Add retry mechanism via request header"

Ticketpark · Jul 24, 2024 · 9b5e5fa · 9b5e5fa
1 parent 625af7c
commit 9b5e5fa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 147 deletions.
diff --git a/example/Transaction/example-authorize-retry.php b/example/Transaction/example-authorize-retry.php
diff --git a/lib/SaferpayJson/Request/Container/RequestHeader.php b/lib/SaferpayJson/Request/Container/RequestHeader.php
@@ -5,7 +5,6 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use Ticketpark\SaferpayJson\Request\RequestConfig;
 
 final class RequestHeader
 {
@@ -34,11 +33,8 @@ final class RequestHeader
      */
     private ?ClientInfo $clientInfo = null;
 
-    public function __construct(
-        string $customerId,
-        string $requestId = null,
-        int    $retryIndicator = RequestConfig::MIN_RETRY_INDICATOR
-    ) {
+    public function __construct(string $customerId, string $requestId = null, int $retryIndicator = 0)
+    {
         $this->customerId = $customerId;
         $this->requestId = $requestId;
         $this->retryIndicator = $retryIndicator;

diff --git a/lib/SaferpayJson/Request/Request.php b/lib/SaferpayJson/Request/Request.php
@@ -50,9 +50,7 @@ public function __construct(RequestConfig $requestConfig)
     public function getRequestHeader(): RequestHeader
     {
         return new RequestHeader(
-            $this->requestConfig->getCustomerId(),
-            $this->requestConfig->getRequestId(),
-            $this->requestConfig->getRetryIndicator()
+            $this->requestConfig->getCustomerId()
         );
     }
 

diff --git a/lib/SaferpayJson/Request/RequestConfig.php b/lib/SaferpayJson/Request/RequestConfig.php
@@ -5,45 +5,21 @@
 namespace Ticketpark\SaferpayJson\Request;
 
 use GuzzleHttp\Client;
-use InvalidArgumentException;
 
 final class RequestConfig
 {
-    public const MIN_RETRY_INDICATOR = 0;
-    public const MAX_RETRY_INDICATOR = 9;
-
     private string $apiKey;
     private string $apiSecret;
     private string $customerId;
     private bool $test;
     private ?Client $client = null;
-    private ?string $requestId;
-    private int $retryIndicator;
 
-    public function __construct(
-        string  $apiKey,
-        string  $apiSecret,
-        string  $customerId,
-        bool    $test = false,
-        ?string $requestId = null,
-        int     $retryIndicator = 0
-    ) {
+    public function __construct(string $apiKey, string $apiSecret, string $customerId, bool $test = false)
+    {
         $this->apiKey = $apiKey;
         $this->apiSecret = $apiSecret;
         $this->customerId = $customerId;
         $this->test = $test;
-
-        if ($retryIndicator < self::MIN_RETRY_INDICATOR || $retryIndicator > self::MAX_RETRY_INDICATOR) {
-            throw new InvalidArgumentException('Retry indicator range: inclusive between '
-                . self::MIN_RETRY_INDICATOR . '  and ' . self::MAX_RETRY_INDICATOR);
-        }
-
-        if ($retryIndicator > self::MIN_RETRY_INDICATOR && $requestId === null) {
-            throw new InvalidArgumentException('Request id must be set if retry indicator is greater than 0');
-        }
-
-        $this->requestId = $requestId;
-        $this->retryIndicator = $retryIndicator;
     }
 
     public function getApiKey(): string
@@ -81,14 +57,4 @@ public function getClient(): Client
 
         return $this->client;
     }
-
-    public function getRequestId(): ?string
-    {
-        return $this->requestId;
-    }
-
-    public function getRetryIndicator(): int
-    {
-        return $this->retryIndicator;
-    }
 }
diff --git a/tests/SaferpayJson/Tests/Request/CommonRequestTest.php b/tests/SaferpayJson/Tests/Request/CommonRequestTest.php
@@ -6,7 +6,6 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response as GuzzleResponse;
 use GuzzleHttp\Psr7\Utils as GuzzleUtils;
-use InvalidArgumentException;
 use JMS\Serializer\SerializerBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -31,39 +30,6 @@ public function testErrorResponse(): void
         $this->executeRequest();
     }
 
-    public function getRequestConfigValidationParams(): array
-    {
-        return [
-            'first try' => [null, RequestConfig::MIN_RETRY_INDICATOR],
-            'second try' => [uniqid(), RequestConfig::MIN_RETRY_INDICATOR + 1],
-            'last try' => [uniqid(), RequestConfig::MAX_RETRY_INDICATOR],
-            'try after all retries exceeded' => [uniqid(), RequestConfig::MAX_RETRY_INDICATOR + 1, InvalidArgumentException::class],
-            'retry without previous request id' => [null, RequestConfig::MAX_RETRY_INDICATOR, InvalidArgumentException::class],
-        ];
-    }
-
-    /**
-     * @dataProvider getRequestConfigValidationParams
-     */
-    public function testRequestConfigValidation(
-        ?string $requestId,
-        int     $retryIndicator,
-        ?string $expectedException = null): void
-    {
-        if ($expectedException !== null) {
-            $this->expectException($expectedException, $requestId, $retryIndicator);
-        }
-
-        new RequestConfig(
-            'apiKey',
-            'apiSecret',
-            'customerId',
-            false,
-            $requestId,
-            $retryIndicator
-        );
-    }
-
     public function doTestSuccessfulResponse(string $responseClass): void
     {
         $this->successful = true;
@@ -121,7 +87,7 @@ private function getResponseMock(): MockObject
 
         $response->expects($this->any())
             ->method('getStatusCode')
-            ->will($this->returnValue($this->successful ? 200 : 404));
+            ->will($this->returnValue($this->successful ? 200: 404));
 
         if ($this->successful) {
             $content = $this->getFakedApiResponse($this->successfulResponseClass);