dddennnisss/trueconf_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename SD config vars to SD_INSTRUCT_GROUP_NAME / SD_INSTRUCT_TECHNICIAN_NAME, move to section 11

Browse Source
This commit is contained in:
Денис Кривоченко
2026-07-26 16:59:10 +07:00
parent 866654a132
commit 005b728d7c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
instruct/handlers.py
+7 -7
View File
@@ -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}")