refactor: optimize notification service

Author: tanhongit

src/Services/NotificationService.php

@@ -2,112 +2,112 @@
 
 namespace CSlant\LaravelTelegramGitNotifier\Services;
 
-use CSlant\TelegramGitNotifier\Exceptions\InvalidViewTemplateException;
-use CSlant\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
-use CSlant\TelegramGitNotifier\Exceptions\SendNotificationException;
+use CSlant\TelegramGitNotifier\Exceptions\{
+    InvalidViewTemplateException,
+    MessageIsEmptyException,
+    SendNotificationException
+};
 use CSlant\TelegramGitNotifier\Models\Setting;
 use CSlant\TelegramGitNotifier\Notifier;
 use CSlant\TelegramGitNotifier\Objects\Validator;
 use Symfony\Component\HttpFoundation\Request;
 
 class NotificationService
 {
-    protected Request $request;
-
-    /**
-     * @var array<int|string>
-     */
+    /** @var array<string, array<int|string>> */
     protected array $chatIds = [];
 
-    protected Notifier $notifier;
-
-    protected Setting $setting;
-
     public function __construct(
-        Notifier $notifier,
-        Setting $setting,
+        protected Notifier $notifier,
+        protected Setting $setting,
+        protected Request $request = new Request()
     ) {
-        $this->request = Request::createFromGlobals();
-        $this->notifier = $notifier;
-        $this->chatIds = $this->notifier->parseNotifyChatIds();
-
-        $this->setting = $setting;
+        $this->request = $request ?? Request::createFromGlobals();
+        $this->chatIds = $notifier->parseNotifyChatIds();
     }
 
     /**
-     * Handle to send notification from webhook event to telegram.
-     *
-     * @return void
+     * Handle sending notification from webhook event to Telegram.
      *
      * @throws InvalidViewTemplateException
      * @throws SendNotificationException
      * @throws MessageIsEmptyException
      */
     public function handle(): void
     {
-        $eventName = $this->notifier->handleEventFromRequest($this->request);
-        if (!empty($eventName)) {
+        if ($eventName = $this->notifier->handleEventFromRequest($this->request)) {
             $this->sendNotification($eventName);
         }
     }
 
     /**
-     * @param  string  $event
-     * @return void
+     * Send notification to all configured chat IDs and threads.
      *
      * @throws InvalidViewTemplateException
      * @throws SendNotificationException
      * @throws MessageIsEmptyException
      */
     private function sendNotification(string $event): void
     {
-        if (!$this->validateAccessEvent($event)) {
+        if (!$this->isValidEvent($event)) {
             return;
         }
 
-        foreach ($this->chatIds as $chatId => $thread) {
+        foreach ($this->chatIds as $chatId => $threads) {
             if (empty($chatId)) {
                 continue;
             }
 
-            if (empty($thread)) {
-                $this->notifier->sendNotify(null, ['chat_id' => $chatId]);
-
-                continue;
-            }
-
-            /** @var array<int|string> $thread */
-            foreach ($thread as $threadId) {
-                $this->notifier->sendNotify(null, [
-                    'chat_id' => $chatId, 'message_thread_id' => $threadId,
-                ]);
-            }
+            empty($threads) 
+                ? $this->sendToChat($chatId)
+                : $this->sendToThreads($chatId, $threads);
         }
     }
 
     /**
-     * Validate access event.
+     * Send notification to a single chat.
      *
-     * @param  string  $event
-     * @return bool
+     * @throws SendNotificationException
+     */
+    private function sendToChat(string $chatId): void
+    {
+        $this->notifier->sendNotify(null, ['chat_id' => $chatId]);
+    }
+
+    /**
+     * Send notification to multiple threads in a chat.
+     *
+     * @param  array<int|string>  $threads
      *
-     * @throws InvalidViewTemplateException|MessageIsEmptyException
+     * @throws SendNotificationException
      */
-    private function validateAccessEvent(string $event): bool
+    private function sendToThreads(string $chatId, array $threads): void
     {
-        $payload = $this->notifier->setPayload($this->request, $event);
-        $validator = new Validator($this->setting, $this->notifier->event);
+        foreach ($threads as $threadId) {
+            $this->notifier->sendNotify(null, [
+                'chat_id' => $chatId,
+                'message_thread_id' => $threadId,
+            ]);
+        }
+    }
 
-        if (empty($payload) || !is_object($payload)
-            || !$validator->isAccessEvent(
-                $this->notifier->event->platform,
-                $event,
-                $payload
-            )
-        ) {
+    /**
+     * Check if the event is valid and accessible.
+     */
+    private function isValidEvent(string $event): bool
+    {
+        $payload = $this->notifier->setPayload($this->request, $event);
+        
+        if (empty($payload) || !is_object($payload)) {
             return false;
         }
 
-        return true;
+        $validator = new Validator($this->setting, $this->notifier->event);
+        
+        return $validator->isAccessEvent(
+            $this->notifier->event->platform,
+            $event,
+            $payload
+        );
     }
 }