From 30fe768207d98b39670212cec49716b8b1382c01 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 18 Nov 2024 15:48:51 +0300
Subject: [PATCH] =?utf8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BC?=
 =?utf8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D0=B8=20=D1=80=D0=B5=D1=84?=
 =?utf8?q?=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/log/CollectAction.php | 4 ++--
 erp24/log/TelegramTarget.php        | 8 ++------
 erp24/services/InfoLogService.php   | 2 +-
 erp24/services/LogService.php       | 3 +--
 erp24/services/TelegramService.php  | 6 +++---
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/erp24/actions/log/CollectAction.php b/erp24/actions/log/CollectAction.php
index c6a8faa6..1e81b6ea 100755
--- 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 5c410326..961d5add 100644
--- 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 636a1c02..22ceb6ea 100644
--- 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 022678f7..53ad71f3 100644
--- 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 02ca1735..1b0ab9c9 100644
--- 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)
-- 
2.39.5