From 6b0982c17e2075eef303997f3822f371e5b1872e Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 22 Jan 2025 14:29:55 +0300
Subject: [PATCH] =?utf8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?=
 =?utf8?q?=D0=BD=D0=B0=20=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20=D1=84=D1=83?=
 =?utf8?q?=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?=
 =?utf8?q?=D1=80=D0=BA=D0=B8=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=BB=D0=BE=D0=B3=D0=B8?=
 =?utf8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BE=D1=88=D0=B8?=
 =?utf8?q?=D0=B1=D0=BE=D0=BA=20=D0=B2=20=D1=82=D0=B5=D0=BB=D0=B5=D0=B3?=
 =?utf8?q?=D1=80=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/log/CollectAction.php | 8 +-------
 erp24/log/TelegramTarget.php        | 9 +--------
 erp24/services/InfoLogService.php   | 8 +-------
 erp24/services/LogService.php       | 7 +------
 4 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/erp24/actions/log/CollectAction.php b/erp24/actions/log/CollectAction.php
index 1e81b6ea..0b15971a 100755
--- a/erp24/actions/log/CollectAction.php
+++ b/erp24/actions/log/CollectAction.php
@@ -36,16 +36,12 @@ class CollectAction extends Action
                 return;
             }*/
 
-
-
-
             // Формируем сообщение для отправки в Telegram с использованием MarkdownV2
             $errorMessage = "⚠️*Ошибка JavaScript Обнаружена*⚠️\n\n";
 
 
             if ($url = $this->controller->request->getReferrer()) {
                 $errorMessage .= "*URL:*\n```" . TelegramService::escapeMarkdownLog($url) . "```\n\n";
-                $isDev = TelegramService::isDevelopmentEnvironment($url);
             }
 
             if ($createdAt = date('Y-m-d H:i:s', $log->log_time)) {
@@ -80,10 +76,8 @@ class CollectAction extends Action
                 $errorMessage .= "*Context:*\n```" . TelegramService::escapeMarkdownLog($context) . "```\n\n";
             }
 
-
-
             $disableNotification = false;
-
+            $isDev = TelegramService::isDevEnv();
             // Отправляем сообщение об ошибке в Telegram через TelegramService
             TelegramService::sendErrorToTelegramMessage($errorMessage, $disableNotification, $isDev);
         }
diff --git a/erp24/log/TelegramTarget.php b/erp24/log/TelegramTarget.php
index fe478987..d9cf99da 100644
--- a/erp24/log/TelegramTarget.php
+++ b/erp24/log/TelegramTarget.php
@@ -104,16 +104,9 @@ class TelegramTarget extends \yii\log\Target
             return;
         }
 
-
-
         $message = new Message($this->messages[0]);
 
-        $errorUrl = $message->getUrl();
-
-        $isDev = TelegramService::isDevelopmentEnvironment($errorUrl);
-
-
-
+        $isDev = TelegramService::isDevEnv();
 
         // Проверка наличия подобных сообщений
         /*if (!$this->shouldSendMessage($errorText)) {
diff --git a/erp24/services/InfoLogService.php b/erp24/services/InfoLogService.php
index 22ceb6ea..17db366d 100644
--- a/erp24/services/InfoLogService.php
+++ b/erp24/services/InfoLogService.php
@@ -29,18 +29,12 @@ class InfoLogService
 
         // Валидация и сохранение лога в базе данных
         if ($infoLog->validate() && $infoLog->save()) {
-
-
            /* if (!self::shouldSendToTelegram($file, $line, $messageText, $context)) {
                 return;
             }*/
 
-            $isDev = TelegramService::isDevelopmentEnvironment();
-
             $telegramMessage = "⚠️*Сообщение из InfoLog*⚠️\n\n";
 
-
-
             if ($file) {
                 $telegramMessage .= "*File:*\n```" . TelegramService::escapeMarkdownLog($file) . "```\n\n";
             }
@@ -57,7 +51,7 @@ class InfoLogService
                 $telegramMessage .= "*Context:*\n```log" . TelegramService::escapeMarkdownLog($context) . "```\n\n";
             }
 
-
+            $isDev = TelegramService::isDevEnv();
             $disableNotification = false;
             // Отправляем сообщение в Telegram
             TelegramService::sendErrorToTelegramMessage($telegramMessage, $disableNotification, $isDev);
diff --git a/erp24/services/LogService.php b/erp24/services/LogService.php
index 53ad71f3..02af15dc 100644
--- a/erp24/services/LogService.php
+++ b/erp24/services/LogService.php
@@ -62,20 +62,16 @@ class LogService
             $apiErrorLog->ip = Yii::$app->request->remoteIP ?? '<no ip>';
             $apiErrorLog->save();
 
-
            /* if (!self::shouldSendToTelegram($hash_input, $jsonString)) {
                 return;
             }*/
 
-
-
                 // Форматирование сообщения об ошибке с условным добавлением строк
             $errorMessage = "⚠️*Ошибка API Обнаружена*⚠️\n\n";
 
             // Добавляем строки только если параметры присутствуют
             if ($url = $apiErrorLog->url) {
                 $errorMessage .= "*URL:*\n```" . TelegramService::escapeMarkdownLog($url) . "```\n\n";
-                $isDev = TelegramService::isDevelopmentEnvironment($url);
             }
 
             if ($createdAt = $apiErrorLog->created_at) {
@@ -90,12 +86,11 @@ class LogService
                 $errorMessage .= "*Payload:*\n```json\n" . $jsonString . "```\n\n";
             }
 
-
+            $isDev = TelegramService::isDevEnv();
             $disableNotification = false;
             // Отправляем сообщение об ошибке в Telegram через TelegramService
             TelegramService::sendErrorToTelegramMessage($errorMessage, $disableNotification, $isDev);
 
-
         } else {
             $h->actualed_at = date('Y-m-d H:i:s');
             $h->ip = Yii::$app->request->remoteIP ?? '<no ip>';
-- 
2.39.5