Merge pull request #16 from dmason30/response-on-failure

Set response field on request failure

src/CallWebhookJob.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
 use Illuminate\Support\Str;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
@@ -78,6 +79,10 @@ public function handle()
 
             return;
         } catch (Exception $exception) {
+            if ($exception instanceof RequestException) {
+               $this->response = $exception->getResponse();
+            }
+
             /** @var \Spatie\WebhookServer\BackoffStrategy\BackoffStrategy $backoffStrategy */
             $backoffStrategy = app($this->backoffStrategyClass);
 

tests/CallWebhookJobTest.php

@@ -130,6 +130,20 @@ public function by_default_it_will_retry_3_times_with_the_exponential_backoff_st
         $this->testClient->assertRequestCount(3);
     }
 
+    /** @test */
+    public function it_sets_the_response_field_on_request_failure()
+    {
+        $this->testClient->throwRequestException();
+
+        $this->baseWebhook()->dispatch();
+
+        $this->artisan('queue:work --once');
+        Event::assertDispatched(WebhookCallFailedEvent::class, function (WebhookCallFailedEvent $event) {
+            $this->assertNotNull($event->response);
+            return true;
+        });
+    }
+
     protected function baseWebhook(): WebhookCall
     {
         return WebhookCall::create()

tests/TestClasses/TestClient.php

@@ -2,6 +2,8 @@
 
 namespace Spatie\WebhookServer\Tests\TestClasses;
 
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\Assert;
 
@@ -11,10 +13,20 @@ class TestClient
 
     private $useResponseCode = 200;
 
+    private $throwRequestException = false;
+
     public function request(string $method, string $url, array $options)
     {
         $this->requests[] = compact('method', 'url', 'options');
 
+        if ($this->throwRequestException) {
+            throw new RequestException(
+                'Request failed exception',
+                new Request($method, $url),
+                new Response(500)
+            );
+        }
+
         return new Response($this->useResponseCode);
     }
 
@@ -40,4 +52,9 @@ public function letEveryRequestFail()
     {
         $this->useResponseCode = 500;
     }
+
+    public function throwRequestException()
+    {
+        $this->throwRequestException = true;
+    }
 }