mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
отправка уведомлений в телеграV2
This commit is contained in:
@@ -57,23 +57,17 @@ def create_request(
|
|||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(db_request)
|
db.refresh(db_request)
|
||||||
|
|
||||||
# Подготавливаем данные для уведомления
|
# Преобразуем объект запроса в словарь для уведомления
|
||||||
request_data = {
|
request_dict = request_to_dict(db_request)
|
||||||
"id": db_request.id,
|
request_dict["employee_name"] = f"{current_employee.last_name} {current_employee.first_name}"
|
||||||
"title": db_request.title,
|
|
||||||
"description": db_request.description,
|
|
||||||
"priority": db_request.priority,
|
|
||||||
"status": db_request.status,
|
|
||||||
"employee_name": f"{current_employee.last_name} {current_employee.first_name}",
|
|
||||||
"created_at": db_request.created_at
|
|
||||||
}
|
|
||||||
|
|
||||||
# Отправляем уведомление в Telegram
|
# Отправляем уведомление в Telegram
|
||||||
notify_new_request(request_data)
|
notify_new_request(request_dict)
|
||||||
|
|
||||||
return request_to_dict(db_request)
|
return request_to_dict(db_request)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
db.rollback()
|
db.rollback()
|
||||||
|
logger.error(f"Error creating request: {e}", exc_info=True)
|
||||||
raise HTTPException(status_code=500, detail=str(e))
|
raise HTTPException(status_code=500, detail=str(e))
|
||||||
|
|
||||||
@router.get("/my", response_model=List[RequestResponse])
|
@router.get("/my", response_model=List[RequestResponse])
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ async def send_request_notification(request_data: dict):
|
|||||||
f"❗ <b>Приоритет:</b> {format_priority(request_data['priority'])}\n"
|
f"❗ <b>Приоритет:</b> {format_priority(request_data['priority'])}\n"
|
||||||
f"📊 <b>Статус:</b> {format_status(request_data['status'])}\n\n"
|
f"📊 <b>Статус:</b> {format_status(request_data['status'])}\n\n"
|
||||||
f"📄 <b>Описание:</b>\n{request_data['description']}\n\n"
|
f"📄 <b>Описание:</b>\n{request_data['description']}\n\n"
|
||||||
f"🕒 <b>Создана:</b> {request_data['created_at'].strftime('%d.%m.%Y %H:%M')}"
|
f"🕒 <b>Создана:</b> {request_data['created_at'].strftime('%d.%m.%Y %H:%M') if request_data['created_at'] else 'Не указано'}"
|
||||||
)
|
)
|
||||||
|
|
||||||
await bot.send_message(
|
await bot.send_message(
|
||||||
|
|||||||
Reference in New Issue
Block a user