Rename SD config vars to SD_INSTRUCT_GROUP_NAME / SD_INSTRUCT_TECHNICIAN_NAME, move to section 11
This commit is contained in:
+6
-6
@@ -96,12 +96,6 @@ ALLOWED_USERS = [ # Список TrueConf ID разрешенны
|
|||||||
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# =========================================================
|
|
||||||
# 3.5. НАСТРОЙКИ SERVICE DESK: ГРУППА И ИСПОЛНИТЕЛЬ
|
|
||||||
# =========================================================
|
|
||||||
SD_GROUP_NAME = "Техподдержка ХК" # Название группы в ServiceDesk
|
|
||||||
SD_TECHNICIAN_NAME = "Кривоченко Денис Сергеевич" # ФИО техника в ServiceDesk
|
|
||||||
|
|
||||||
# =========================================================
|
# =========================================================
|
||||||
# 3. НАСТРОЙКИ СВЯЗИ С КОРПОРАТИВНЫМИ СИСТЕМАМИ
|
# 3. НАСТРОЙКИ СВЯЗИ С КОРПОРАТИВНЫМИ СИСТЕМАМИ
|
||||||
# =========================================================
|
# =========================================================
|
||||||
@@ -225,3 +219,9 @@ OTP_MAX_ATTEMPTS = 3
|
|||||||
OTP_BLOCK_DURATION_SEC = 1800
|
OTP_BLOCK_DURATION_SEC = 1800
|
||||||
# Глобальный таймаут неактивности пользователя в любом подменю (1800 секунд = 30 минут)
|
# Глобальный таймаут неактивности пользователя в любом подменю (1800 секунд = 30 минут)
|
||||||
SESSION_TIMEOUT = 1800
|
SESSION_TIMEOUT = 1800
|
||||||
|
|
||||||
|
# =========================================================
|
||||||
|
# 11. МОДУЛЬ INSTRUCT: НАСТРОЙКИ SERVICE DESK: ГРУППА И ИСПОЛНИТЕЛЬ
|
||||||
|
# =========================================================
|
||||||
|
SD_INSTRUCT_GROUP_NAME = "Техподдержка ХК" # Название группы в ServiceDesk
|
||||||
|
SD_INSTRUCT_TECHNICIAN_NAME = "Кривоченко Денис Сергеевич" # ФИО техника в ServiceDesk
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ from utils.stats_logger import log_menu_stats
|
|||||||
|
|
||||||
# Безопасный импорт конфигурации
|
# Безопасный импорт конфигурации
|
||||||
try:
|
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:
|
except ImportError:
|
||||||
import importlib.util
|
import importlib.util
|
||||||
config_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config", "config.py")
|
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
|
DEFAULT_REQUESTER = custom_config.DEFAULT_REQUESTER
|
||||||
SD_URL = custom_config.SD_URL
|
SD_URL = custom_config.SD_URL
|
||||||
SD_TOKEN = custom_config.SD_TOKEN
|
SD_TOKEN = custom_config.SD_TOKEN
|
||||||
SD_GROUP_NAME = custom_config.SD_GROUP_NAME
|
SD_INSTRUCT_GROUP_NAME = custom_config.SD_INSTRUCT_GROUP_NAME
|
||||||
SD_TECHNICIAN_NAME = custom_config.SD_TECHNICIAN_NAME
|
SD_INSTRUCT_TECHNICIAN_NAME = custom_config.SD_INSTRUCT_TECHNICIAN_NAME
|
||||||
|
|
||||||
logger = logging.getLogger(__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:
|
if resp.status_code == 200:
|
||||||
groups = resp.json().get("groups", [])
|
groups = resp.json().get("groups", [])
|
||||||
for g in 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")
|
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
|
break
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"Failed to fetch SD groups: {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:
|
if resp.status_code == 200:
|
||||||
techs = resp.json().get("technicians", [])
|
techs = resp.json().get("technicians", [])
|
||||||
for t in techs:
|
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")
|
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
|
break
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"Failed to fetch SD technicians: {e}")
|
logger.warning(f"Failed to fetch SD technicians: {e}")
|
||||||
|
|||||||
Reference in New Issue
Block a user