Merge pull request #358 from bowphp/refactor/code-base

Refactoring queue adapter and add redis support

Author: papac

docker-compose.yml

@@ -18,7 +18,7 @@ services:
         image: mysql:8.3.0
         restart: unless-stopped
         ports:
-            - "3308:3306"
+            - "3306:3306"
         environment:
             MYSQL_DATABASE: test_db
             MYSQL_ROOT_PASSWORD: password
@@ -73,7 +73,7 @@ services:
         restart: unless-stopped
         ports:
             - "1025:1025"
-            - "1080:8025"
+            - "1080:1080"
         networks:
             - bowphp_network
         healthcheck:

src/Http/Client/Response.php

@@ -133,9 +133,9 @@ public function isSuccessful(): bool
     /**
      * Get the response executing time
      *
-     * @return ?int
+     * @return mixed
      */
-    public function getExecutionTime(): ?int
+    public function getExecutionTime(): mixed
     {
         return $this->headers['total_time'] ?? null;
     }

src/Mail/MailQueueTask.php

@@ -60,6 +60,6 @@ public function process(): void
      */
     public function onException(Throwable $e): void
     {
-        $this->deleteJob();
+        $this->deleteTask();
     }
 }

src/Notifier/Adapters/TelegramChannelAdapter.php

@@ -15,7 +15,7 @@ class TelegramChannelAdapter implements ChannelAdapterInterface
     /**
      * @var string
      */
-    private string $botToken;
+    private ?string $botToken;
 
     /**
      * Constructor
@@ -25,10 +25,6 @@ class TelegramChannelAdapter implements ChannelAdapterInterface
     public function __construct()
     {
         $this->botToken = config('messaging.telegram.bot_token');
-
-        if (!$this->botToken) {
-            throw new InvalidArgumentException('The Telegram bot token is required');
-        }
     }
 
     /**
@@ -51,6 +47,10 @@ public function send(Model $context, Notifier $notifier): void
             throw new InvalidArgumentException('The chat ID and message are required for Telegram');
         }
 
+        if (!$this->botToken) {
+            throw new InvalidArgumentException('The Telegram bot token is required');
+        }
+
         $client = new HttpClient();
         $endpoint = "https://api.telegram.org/bot{$this->botToken}/sendMessage";
 

src/Notifier/NotifierQueueTask.php

@@ -52,6 +52,6 @@ public function process(): void
      */
     public function onException(Throwable $e): void
     {
-        $this->deleteJob();
+        $this->deleteTask();
     }
 }

src/Notifier/NotifierShouldQueue.php

@@ -4,4 +4,4 @@
 
 interface NotifierShouldQueue
 {
-}
+}