Merge pull request #426 from keboola/pepa_PST-1911_dates

PST-1911 Search API fixes

Author: pepamartinec

src/Client.php

@@ -572,7 +572,7 @@ private function sendRequest(Request $request): array
         } catch (GuzzleClientException $e) {
             $body = $this->decodeRequestBody($e->getResponse());
             $this->throwExceptionByStringCode($body, $e);
-            throw new ClientException($e->getMessage(), $e->getCode(), $e);
+            throw new ClientException($e->getMessage(), $e->getCode(), $e, $body);
         } catch (GuzzleException $e) {
             throw new ClientException($e->getMessage(), $e->getCode(), $e);
         }
@@ -604,24 +604,28 @@ private function throwExceptionByStringCode(array $body, Throwable $previous): v
                     $previous->getMessage(),
                     $previous->getCode(),
                     $previous,
+                    $body,
                 );
             case StateTransitionForbiddenException::STRING_CODE:
                 throw new StateTransitionForbiddenException(
                     $previous->getMessage(),
                     $previous->getCode(),
                     $previous,
+                    $body,
                 );
             case StateTerminalException::STRING_CODE:
                 throw new StateTerminalException(
                     $previous->getMessage(),
                     $previous->getCode(),
                     $previous,
+                    $body,
                 );
             case DeduplicationIdConflictException::STRING_CODE:
                 throw new DeduplicationIdConflictException(
                     $previous->getMessage(),
                     $previous->getCode(),
                     $previous,
+                    $body,
                 );
         }
     }

src/Exception/ClientException.php

@@ -5,7 +5,21 @@
 namespace Keboola\JobQueueInternalClient\Exception;
 
 use RuntimeException;
+use Throwable;
 
 class ClientException extends RuntimeException
 {
+    public function __construct(
+        string $message = '',
+        int $code = 0,
+        ?Throwable $previous = null,
+        private readonly ?array $responseData = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+
+    public function getResponseData(): ?array
+    {
+        return $this->responseData;
+    }
 }

tests/ClientFunctionalTest.php

@@ -393,9 +393,19 @@ public function testGetJobStartTimeEndTime(): void
     public function testGetInvalidJob(): void
     {
         $client = $this->getClient();
-        $this->expectException(ClientException::class);
-        $this->expectExceptionMessage('404 Not Found');
-        $client->getJob('123456');
+
+        try {
+            $client->getJob('123456');
+            self::fail('Request should fail');
+        } catch (ClientException $e) {
+            self::assertStringContainsString('404 Not Found', $e->getMessage());
+            self::assertSame(404, $e->getCode());
+
+            self::assertIsArray($e->getResponseData());
+            self::assertSame('error', $e->getResponseData()['status'] ?? null);
+            self::assertSame('Job "123456" not found', $e->getResponseData()['error'] ?? null);
+            self::assertSame([], $e->getResponseData()['context'] ?? null);
+        }
     }
 
     public function testGetJobsWithStatuses(): void