Замена метода и рефакторинг

diff --git a/erp24/actions/log/CollectAction.php b/erp24/actions/log/CollectAction.php
index c6a8faa6664f92a22c452902fa4f6318a8700d15..1e81b6ea176447575de485c8b368f9b38aaf0f88 100755 (executable)
--- a/erp24/actions/log/CollectAction.php
+++ b/erp24/actions/log/CollectAction.php
@@ -37,7 +37,7 @@ class CollectAction extends Action
             }*/
 
 
-            $isDev = TelegramService::isDevelopmentEnvironment(TelegramService::TARGET_PROD_URL);
+
 
             // Формируем сообщение для отправки в Telegram с использованием MarkdownV2
             $errorMessage = "⚠️*Ошибка JavaScript Обнаружена*⚠️\n\n";
@@ -45,7 +45,7 @@ class CollectAction extends Action
 
             if ($url = $this->controller->request->getReferrer()) {
                 $errorMessage .= "*URL:*\n```" . TelegramService::escapeMarkdownLog($url) . "```\n\n";
-                $isDev = !str_contains($url, TelegramService::TARGET_PROD_URL);
+                $isDev = TelegramService::isDevelopmentEnvironment($url);
             }
 
             if ($createdAt = date('Y-m-d H:i:s', $log->log_time)) {

diff --git a/erp24/log/TelegramTarget.php b/erp24/log/TelegramTarget.php
index 5c410326d742378755d498c93a9bba117390e6bc..961d5adde70e5fb53b43dab8f83ae10fa463cc1d 100644 (file)
--- a/erp24/log/TelegramTarget.php
+++ b/erp24/log/TelegramTarget.php
@@ -108,14 +108,10 @@ class TelegramTarget extends \yii\log\Target
 
         $message = new Message($this->messages[0]);
 
-
         $errorUrl = $message->getUrl();
 
-        if(!empty($errorUrl)){
-            $isDev = !str_contains($errorUrl, TelegramService::TARGET_PROD_URL);
-        }else {
-            $isDev = TelegramService::isDevelopmentEnvironment(TelegramService::TARGET_PROD_URL);
-        }
+        $isDev = TelegramService::isDevelopmentEnvironment($errorUrl);
+
 
 
 

diff --git a/erp24/services/InfoLogService.php b/erp24/services/InfoLogService.php
index 636a1c02ef3f5e51e981c709ff4e46c538eaaf83..22ceb6ea764c517363821e572fb356588ffbfa24 100644 (file)
--- a/erp24/services/InfoLogService.php
+++ b/erp24/services/InfoLogService.php
@@ -35,7 +35,7 @@ class InfoLogService
                 return;
             }*/
 
-            $isDev = TelegramService::isDevelopmentEnvironment(TelegramService::TARGET_PROD_URL);
+            $isDev = TelegramService::isDevelopmentEnvironment();
 
             $telegramMessage = "⚠️*Сообщение из InfoLog*⚠️\n\n";
 

diff --git a/erp24/services/LogService.php b/erp24/services/LogService.php
index 022678f7559a664e46fc9ddcbf0ce07af6008b97..53ad71f3d77b0d28d51460175d7ef0bdb629ab0c 100644 (file)
--- a/erp24/services/LogService.php
+++ b/erp24/services/LogService.php
@@ -68,7 +68,6 @@ class LogService
             }*/
 
 
-            $isDev = TelegramService::isDevelopmentEnvironment(TelegramService::TARGET_PROD_URL);
 
                 // Форматирование сообщения об ошибке с условным добавлением строк
             $errorMessage = "⚠️*Ошибка API Обнаружена*⚠️\n\n";
@@ -76,7 +75,7 @@ class LogService
             // Добавляем строки только если параметры присутствуют
             if ($url = $apiErrorLog->url) {
                 $errorMessage .= "*URL:*\n```" . TelegramService::escapeMarkdownLog($url) . "```\n\n";
-                $isDev = !str_contains($url, TelegramService::TARGET_PROD_URL);
+                $isDev = TelegramService::isDevelopmentEnvironment($url);
             }
 
             if ($createdAt = $apiErrorLog->created_at) {

diff --git a/erp24/services/TelegramService.php b/erp24/services/TelegramService.php
index 02ca173548c526acafa24b51bb13ae8b2efa3d23..1b0ab9c98ba3b6b993c52b88ff6b0b40fc1e56d0 100644 (file)
--- a/erp24/services/TelegramService.php
+++ b/erp24/services/TelegramService.php
@@ -22,10 +22,10 @@ class TelegramService {
         return $client->request('GET', $url);
     }
 
-     public static function isDevelopmentEnvironment($prodUrl) : bool
+     public static function isDevelopmentEnvironment($urlString = null) : bool
      {
-         $currentUrl = Yii::$app->request->getHostInfo();
-         return !str_contains($currentUrl, $prodUrl);
+         $currentUrl = empty($urlString) ? Yii::$app->request->getHostInfo() : $urlString;
+         return !str_contains($currentUrl, self::TARGET_PROD_URL);
      }
 
 public static function sendErrorToTelegramMessage($message,$disableNotification, $isDev)