Правка отправки сообщения в ТГ, isDev проброс в job очереди

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 5a9678f7f28b006d762e33e37414f2c4194e3a95..69106a1455f0eb094e47b38823df17db977a9917 100644 (file)
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -402,6 +402,8 @@ class CronController extends Controller
 
     public function actionSendFirstTelegramMessage()
     {
+        $isDev = TelegramService::isDevEnv();
+
         $messagesSettings = UsersMessageManagement::find()->one();
         if (!$messagesSettings) {
             $this->stdout(
@@ -507,6 +509,7 @@ class CronController extends Controller
 
                     Yii::$app->queue->push(new SendTelegramMessageJob([
                         'messageData' => $messageData,
+                        'isDev' => $isDev,
                     ]));
                 }
                 //TODO - перенос в отправку

diff --git a/erp24/jobs/SendTelegramMessageJob.php b/erp24/jobs/SendTelegramMessageJob.php
index b94251cae290efcfe28d3387ba09f8f07fe4a927..05ce3b51b331a0f278939b64f661dc6500817fce 100644 (file)
--- a/erp24/jobs/SendTelegramMessageJob.php
+++ b/erp24/jobs/SendTelegramMessageJob.php
@@ -10,12 +10,15 @@ use yii_app\services\TelegramService;
 class SendTelegramMessageJob extends \yii\base\BaseObject implements JobInterface
 {
     public $messageData;
+    public $isDev;
 
     public static $messagesSent = 0;
     public static $lastResetTime;
 
     public function execute($queue)
     {
+        $isDev = ($this->isDev);
+
         if (!self::$lastResetTime || (microtime(true) - self::$lastResetTime) > 1) {
             self::$lastResetTime = microtime(true);
             self::$messagesSent = 0;
@@ -35,7 +38,7 @@ class SendTelegramMessageJob extends \yii\base\BaseObject implements JobInterfac
         $message = ($this->messageData)['message'];
 
         try {
-            $result = TelegramService::sendMessageToTelegramClient($chatId, $message);
+            $result = TelegramService::sendMessageToTelegramClient($chatId, $message, $isDev);
 
             if ($result == "OK") {
                 try {

diff --git a/erp24/services/TelegramService.php b/erp24/services/TelegramService.php
index 1eb4afd43793dc2ad4df5c74f8fd6b0bf9c1cd52..ba7f6de9d7d2862d9e4eec1fcf1bc6e353a50db7 100644 (file)
--- a/erp24/services/TelegramService.php
+++ b/erp24/services/TelegramService.php
@@ -305,9 +305,9 @@ class TelegramService
         return $result;
     }
 
-    public static function sendMessageToTelegramClient($chatId, $message)
+    public static function sendMessageToTelegramClient($chatId, $message, $isDev = true)
     {
-        if (self::isDevEnv()) {
+        if ($isDev) {
             $botToken = self::TELEGRAM_BOT_DEV;
         } else {
             $botToken = self::TELEGRAM_BOT_PROD;