Merge pull request #119 from 4irik/dispatch-event-on-exception

Author: irazasyed

composer.json

@@ -22,6 +22,7 @@
         "php": "^7.2 || ^8.0",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.2 || ^7.0",
+        "illuminate/contracts": "^5.5 || ^6.0 || ^7.0 || ^8.0",
         "illuminate/notifications": "^5.5 || ^6.0 || ^7.0 || ^8.0",
         "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0"
     },

src/TelegramChannel.php

@@ -2,6 +2,8 @@
 
 namespace NotificationChannels\Telegram;
 
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Notifications\Events\NotificationFailed;
 use Illuminate\Notifications\Notification;
 use NotificationChannels\Telegram\Exceptions\CouldNotSendNotification;
 
@@ -15,14 +17,21 @@ class TelegramChannel
      */
     protected $telegram;
 
+    /**
+     * @var Dispatcher
+     */
+    private $dispatcher;
+
     /**
      * Channel constructor.
      *
      * @param Telegram $telegram
+     * @param Dispatcher $dispatcher
      */
-    public function __construct(Telegram $telegram)
+    public function __construct(Telegram $telegram, Dispatcher $dispatcher)
     {
         $this->telegram = $telegram;
+        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -56,16 +65,28 @@ public function send($notifiable, Notification $notification): ?array
 
         $params = $message->toArray();
 
-        if ($message instanceof TelegramMessage) {
-            $response = $this->telegram->sendMessage($params);
-        } elseif ($message instanceof TelegramLocation) {
-            $response = $this->telegram->sendLocation($params);
-        } elseif ($message instanceof TelegramFile) {
-            $response = $this->telegram->sendFile($params, $message->type, $message->hasFile());
-        } else {
-            return null;
+        try{
+            if ($message instanceof TelegramMessage) {
+                $response = $this->telegram->sendMessage($params);
+            } elseif ($message instanceof TelegramLocation) {
+                $response = $this->telegram->sendLocation($params);
+            } elseif ($message instanceof TelegramFile) {
+                $response = $this->telegram->sendFile($params, $message->type, $message->hasFile());
+            } else {
+                return null;
+            }
+        } catch (CouldNotSendNotification $exception) {
+            $this->dispatcher->dispatch(new NotificationFailed(
+                $notifiable,
+                $notification,
+                'telegram',
+                []
+            ));
+
+            throw $exception;
         }
 
+
         return json_decode($response->getBody()->getContents(), true);
     }
 }

src/TelegramServiceProvider.php

@@ -3,6 +3,7 @@
 namespace NotificationChannels\Telegram;
 
 use GuzzleHttp\Client as HttpClient;
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Notifications\ChannelManager;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\ServiceProvider;
@@ -35,11 +36,14 @@ public function register()
     {
         Notification::resolved(function (ChannelManager $service) {
             $service->extend('telegram', function ($app) {
-                return new TelegramChannel(new Telegram(
-                    config('services.telegram-bot-api.token'),
-                    app(HttpClient::class),
-                    config('services.telegram-bot-api.base_uri')
-                ));
+                return new TelegramChannel(
+                    new Telegram(
+                        config('services.telegram-bot-api.token'),
+                        app(HttpClient::class),
+                        config('services.telegram-bot-api.base_uri')
+                    ),
+                    app(Dispatcher::class)
+                );
             });
         });
     }

tests/TelegramChannelTest.php

@@ -3,9 +3,12 @@
 namespace NotificationChannels\Telegram\Test;
 
 use GuzzleHttp\Psr7\Response;
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Notifications\Events\NotificationFailed;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
 use Mockery;
+use NotificationChannels\Telegram\Exceptions\CouldNotSendNotification;
 use NotificationChannels\Telegram\Telegram;
 use NotificationChannels\Telegram\TelegramChannel;
 use NotificationChannels\Telegram\TelegramMessage;
@@ -19,14 +22,18 @@ class TelegramChannelTest extends TestCase
     /** @var Mockery\Mock */
     protected $telegram;
 
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    private $dispatcher;
+
     /** @var TelegramChannel */
     protected $channel;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->telegram = Mockery::mock(Telegram::class);
-        $this->channel = new TelegramChannel($this->telegram);
+        $this->dispatcher = $this->createMock(Dispatcher::class);
+        $this->channel = new TelegramChannel($this->telegram, $this->dispatcher);
     }
 
     public function tearDown(): void
@@ -51,6 +58,38 @@ public function it_can_send_a_message(): void
 
         self::assertSame($expectedResponse, $actualResponse);
     }
+
+    /**
+     * @test
+     */
+    public function notification_failed_event(): void
+    {
+        self::expectException($exception_class = CouldNotSendNotification::class);
+        self::expectExceptionMessage($exception_message = 'Some exception');
+
+        $notifiable = new TestNotifiable();
+        $notification = new TestNotification();
+
+        $this->telegram
+            ->shouldReceive('sendMessage')
+            ->andThrow($exception_class , $exception_message)
+        ;
+
+        $this->dispatcher
+            ->expects($this->once())
+            ->method('dispatch')
+            ->with(
+                new NotificationFailed(
+                    $notifiable,
+                    $notification,
+                    'telegram',
+                    []
+                )
+            )
+        ;
+
+        $this->channel->send($notifiable, $notification);
+    }
 }
 
 /**