From 005b728d7c13ab72d172d2d23e4a92f1140c4525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=9A=D1=80=D0=B8=D0=B2?= =?UTF-8?q?=D0=BE=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Sun, 26 Jul 2026 16:59:10 +0700 Subject: [PATCH] Rename SD config vars to SD_INSTRUCT_GROUP_NAME / SD_INSTRUCT_TECHNICIAN_NAME, move to section 11 --- config/config.py | 12 ++++++------ instruct/handlers.py | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/config.py b/config/config.py index 1558c84..b6339a3 100644 --- a/config/config.py +++ b/config/config.py @@ -96,12 +96,6 @@ ALLOWED_USERS = [ # Список TrueConf ID разрешенны ] -# ========================================================= -# 3.5. НАСТРОЙКИ SERVICE DESK: ГРУППА И ИСПОЛНИТЕЛЬ -# ========================================================= -SD_GROUP_NAME = "Техподдержка ХК" # Название группы в ServiceDesk -SD_TECHNICIAN_NAME = "Кривоченко Денис Сергеевич" # ФИО техника в ServiceDesk - # ========================================================= # 3. НАСТРОЙКИ СВЯЗИ С КОРПОРАТИВНЫМИ СИСТЕМАМИ # ========================================================= @@ -225,3 +219,9 @@ OTP_MAX_ATTEMPTS = 3 OTP_BLOCK_DURATION_SEC = 1800 # Глобальный таймаут неактивности пользователя в любом подменю (1800 секунд = 30 минут) SESSION_TIMEOUT = 1800 + +# ========================================================= +# 11. МОДУЛЬ INSTRUCT: НАСТРОЙКИ SERVICE DESK: ГРУППА И ИСПОЛНИТЕЛЬ +# ========================================================= +SD_INSTRUCT_GROUP_NAME = "Техподдержка ХК" # Название группы в ServiceDesk +SD_INSTRUCT_TECHNICIAN_NAME = "Кривоченко Денис Сергеевич" # ФИО техника в ServiceDesk diff --git a/instruct/handlers.py b/instruct/handlers.py index fb67262..933cae7 100644 --- a/instruct/handlers.py +++ b/instruct/handlers.py @@ -21,7 +21,7 @@ from utils.stats_logger import log_menu_stats # Безопасный импорт конфигурации try: - from config.config import DEFAULT_REQUESTER, SD_URL, SD_TOKEN, SD_GROUP_NAME, SD_TECHNICIAN_NAME + from config.config import DEFAULT_REQUESTER, SD_URL, SD_TOKEN, SD_INSTRUCT_GROUP_NAME, SD_INSTRUCT_TECHNICIAN_NAME except ImportError: import importlib.util config_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config", "config.py") @@ -31,8 +31,8 @@ except ImportError: DEFAULT_REQUESTER = custom_config.DEFAULT_REQUESTER SD_URL = custom_config.SD_URL SD_TOKEN = custom_config.SD_TOKEN - SD_GROUP_NAME = custom_config.SD_GROUP_NAME - SD_TECHNICIAN_NAME = custom_config.SD_TECHNICIAN_NAME + SD_INSTRUCT_GROUP_NAME = custom_config.SD_INSTRUCT_GROUP_NAME + SD_INSTRUCT_TECHNICIAN_NAME = custom_config.SD_INSTRUCT_TECHNICIAN_NAME logger = logging.getLogger(__name__) @@ -120,9 +120,9 @@ async def _send_sd_api_request(requester_email: str, subject: str, description: if resp.status_code == 200: groups = resp.json().get("groups", []) for g in groups: - if g.get("name") == SD_GROUP_NAME: + if g.get("name") == SD_INSTRUCT_GROUP_NAME: group_id = g.get("id") - logger.info(f"SD group found: name={SD_GROUP_NAME}, id={group_id}") + logger.info(f"SD group found: name={SD_INSTRUCT_GROUP_NAME}, id={group_id}") break except Exception as e: logger.warning(f"Failed to fetch SD groups: {e}") @@ -137,9 +137,9 @@ async def _send_sd_api_request(requester_email: str, subject: str, description: if resp.status_code == 200: techs = resp.json().get("technicians", []) for t in techs: - if t.get("display_name") == SD_TECHNICIAN_NAME: + if t.get("display_name") == SD_INSTRUCT_TECHNICIAN_NAME: tech_id = t.get("id") - logger.info(f"SD technician found: name={SD_TECHNICIAN_NAME}, id={tech_id}") + logger.info(f"SD technician found: name={SD_INSTRUCT_TECHNICIAN_NAME}, id={tech_id}") break except Exception as e: logger.warning(f"Failed to fetch SD technicians: {e}")