Refine bulk exception response access

Author: stevebauman

src/Exceptions/BulkRequestException.php

@@ -10,25 +10,24 @@
 class BulkRequestException extends ErrorException
 {
     /**
-     * Create a new bulk request exception from an OpenSearch response.
+     * The OpenSearch bulk response.
      *
-     * @param  array<string, mixed>  $response
+     * @var array<string, mixed>
      */
-    public static function fromResponse(array $response): self
-    {
-        return new self($response, self::makeMessageFromResponse($response));
-    }
+    protected array $response = [];
 
     /**
-     * Create a new bulk request exception instance.
+     * Create a new bulk request exception from an OpenSearch response.
      *
      * @param  array<string, mixed>  $response
      */
-    public function __construct(
-        protected array $response,
-        string $message = '',
-    ) {
-        parent::__construct($message);
+    public static function fromResponse(array $response): self
+    {
+        $instance = new self(self::makeMessageFromResponse($response));
+
+        $instance->response = $response;
+
+        return $instance;
     }
 
     /**
@@ -39,7 +38,7 @@ public function __construct(
     public function context(): array
     {
         return [
-            'response' => $this->getResponse(),
+            'response' => $this->response(),
         ];
     }
 
@@ -48,7 +47,7 @@ public function context(): array
      *
      * @return array<string, mixed>
      */
-    public function getResponse(): array
+    public function response(): array
     {
         return $this->response;
     }
@@ -59,6 +58,7 @@ public function getResponse(): array
     protected static function makeMessageFromResponse(array $response): string
     {
         $items = $response['items'] ?? [];
+
         $count = count($items);
 
         $reason = sprintf('%s did not complete successfully.', $count > 0 ? $count.' bulk operation(s)' : 'One or more');
@@ -67,7 +67,7 @@ protected static function makeMessageFromResponse(array $response): string
         $firstOperation = reset($failedOperations);
         $firstError = ($firstOperation ?? [])['error'] ?? null;
 
-        if (isset($firstError) && isset($firstError['type']) && isset($firstError['reason'])) {
+        if (isset($firstError['reason']) && isset($firstError['type'])) {
             $reason .= sprintf(' %s: %s. Reason: %s.', $count > 1 ? 'First error' : 'Error', $firstError['type'], $firstError['reason']);
         }
 

src/Search/SearchResponse.php

@@ -81,13 +81,10 @@ public function suggestions(): array
     {
         $suggest = $this->response['suggest'] ?? [];
 
-        return array_map(
-            fn (array $suggestions) => array_map(
-                fn (array $suggestion) => new Suggestion($suggestion),
-                $suggestions,
-            ),
-            $suggest,
-        );
+        return array_map(fn (array $suggestions) => array_map(
+            fn (array $suggestion) => new Suggestion($suggestion),
+            $suggestions,
+        ), $suggest);
     }
 
     /**

tests/Unit/Exceptions/BulkRequestExceptionTest.php

@@ -29,7 +29,7 @@
 
     $exception = BulkRequestException::fromResponse($response);
 
-    $this->assertSame($response, $exception->getResponse());
+    $this->assertSame($response, $exception->response());
 });
 
 test('first error message from response is given in exception message', function () {