refactor: optimize services

Author: tanhongit

composer.json

@@ -36,7 +36,7 @@
     }
   },
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "cslant/telegram-git-notifier": "^v1.4"
   },
   "require-dev": {

src/Http/Actions/IndexAction.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CSlant\LaravelTelegramGitNotifier\Http\Actions;
 
 use CSlant\LaravelTelegramGitNotifier\Services\CallbackService;
@@ -15,36 +17,38 @@
 use CSlant\TelegramGitNotifier\Exceptions\SendNotificationException;
 use CSlant\TelegramGitNotifier\Notifier;
 use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Telegram;
+use Telegram\Telegram as TelegramSDK;
 
 class IndexAction
 {
-    protected Client $client;
-
-    protected Bot $bot;
-
-    protected Notifier $notifier;
-
-    protected Request $request;
+    public function __construct(
+        private ClientInterface $client,
+        private Bot $bot,
+        private Notifier $notifier,
+        private Request $request
+    ) {
+    }
 
     /**
+     * Create a new instance with default dependencies.
+     *
      * @throws ConfigFileException
      */
-    public function __construct()
+    public static function createDefault(): self
     {
-        $this->client = new Client();
-
-        $telegram = new Telegram(config('telegram-git-notifier.bot.token'));
-        $this->bot = new Bot($telegram);
-        $this->notifier = new Notifier();
+        return new self(
+            new Client(),
+            new Bot(new TelegramSDK(config('telegram-git-notifier.bot.token'))),
+            new Notifier(),
+            Request::createFromGlobals()
+        );
     }
 
     /**
      * Handle telegram git notifier app.
      *
-     * @return void
-     *
      * @throws InvalidViewTemplateException
      * @throws MessageIsEmptyException
      * @throws SendNotificationException
@@ -55,23 +59,69 @@ public function __construct()
     public function __invoke(): void
     {
         if ($this->bot->isCallback()) {
-            $callbackAction = new CallbackService($this->bot);
-            $callbackAction->handle();
+            $this->handleCallback();
+            return;
+        }
 
+        if ($this->shouldHandleCommand()) {
+            $this->handleCommand();
             return;
         }
 
-        if ($this->bot->isMessage() && $this->bot->isOwner()) {
-            $commandAction = new CommandService($this->bot);
-            $commandAction->handle();
+        $this->handleNotification();
+    }
+
+    /**
+     * Handle callback actions.
+     *
+     * @throws CallbackException
+     * @throws EntryNotFoundException
+     * @throws InvalidViewTemplateException
+     * @throws MessageIsEmptyException
+     */
+    private function handleCallback(): void
+    {
+        $callbackAction = new CallbackService($this->bot);
+        $callbackAction->handle();
+    }
 
+    /**
+     * Handle command messages.
+     *
+     * @throws EntryNotFoundException
+     * @throws MessageIsEmptyException
+     */
+    private function handleCommand(): void
+    {
+        if (!$this->bot->isMessage() || !$this->bot->isOwner()) {
             return;
         }
 
-        $sendNotification = new NotificationService(
+        $commandAction = new CommandService($this->bot);
+        $commandAction->handle();
+    }
+
+    /**
+     * Handle notification sending.
+     *
+     * @throws InvalidViewTemplateException
+     * @throws MessageIsEmptyException
+     * @throws SendNotificationException
+     */
+    private function handleNotification(): void
+    {
+        $notificationService = new NotificationService(
             $this->notifier,
             $this->bot->setting
         );
-        $sendNotification->handle();
+        $notificationService->handle();
+    }
+
+    /**
+     * Check if the current message should be handled as a command.
+     */
+    private function shouldHandleCommand(): bool
+    {
+        return $this->bot->isMessage() && $this->bot->isOwner();
     }
 }

src/Http/Actions/WebhookAction.php

@@ -1,24 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CSlant\LaravelTelegramGitNotifier\Http\Actions;
 
 use CSlant\LaravelTelegramGitNotifier\Services\WebhookService;
 use CSlant\TelegramGitNotifier\Exceptions\WebhookException;
 
 class WebhookAction
 {
-    protected WebhookService $webhookService;
-
-    public function __construct()
-    {
-        $this->webhookService = new WebhookService();
+    public function __construct(
+        private readonly WebhookService $webhookService
+    ) {
     }
 
     /**
      * Set webhook for telegram bot.
      *
-     * @return string
-     *
      * @throws WebhookException
      */
     public function set(): string
@@ -29,8 +27,6 @@ public function set(): string
     /**
      * Delete webhook for telegram bot.
      *
-     * @return string
-     *
      * @throws WebhookException
      */
     public function delete(): string
@@ -41,8 +37,6 @@ public function delete(): string
     /**
      * Get webhook update.
      *
-     * @return string
-     *
      * @throws WebhookException
      */
     public function getUpdates(): string
@@ -53,8 +47,6 @@ public function getUpdates(): string
     /**
      * Get webhook info.
      *
-     * @return string
-     *
      * @throws WebhookException
      */
     public function getWebHookInfo(): string