mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
отправка уведомлений в телеграV3
This commit is contained in:
@@ -9,6 +9,10 @@ from ..utils.auth import get_current_admin, get_current_employee
|
|||||||
from sqlalchemy import func
|
from sqlalchemy import func
|
||||||
from ..models.employee import Employee
|
from ..models.employee import Employee
|
||||||
from ..utils.telegram import notify_new_request, notify_status_change
|
from ..utils.telegram import notify_new_request, notify_status_change
|
||||||
|
import logging
|
||||||
|
|
||||||
|
# Initialize logger
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
@@ -41,7 +45,7 @@ def get_requests(
|
|||||||
def create_request(
|
def create_request(
|
||||||
request: RequestCreate,
|
request: RequestCreate,
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
current_employee: Employee = Depends(get_current_employee)
|
current_employee: dict = Depends(get_current_employee)
|
||||||
):
|
):
|
||||||
"""Create new request"""
|
"""Create new request"""
|
||||||
try:
|
try:
|
||||||
@@ -50,16 +54,19 @@ def create_request(
|
|||||||
description=request.description,
|
description=request.description,
|
||||||
priority=request.priority,
|
priority=request.priority,
|
||||||
status=RequestStatus.NEW,
|
status=RequestStatus.NEW,
|
||||||
employee_id=current_employee.id
|
employee_id=current_employee["id"]
|
||||||
)
|
)
|
||||||
|
|
||||||
db.add(db_request)
|
db.add(db_request)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(db_request)
|
db.refresh(db_request)
|
||||||
|
|
||||||
|
# Получаем информацию о сотруднике
|
||||||
|
employee = db.query(Employee).filter(Employee.id == current_employee["id"]).first()
|
||||||
|
|
||||||
# Преобразуем объект запроса в словарь для уведомления
|
# Преобразуем объект запроса в словарь для уведомления
|
||||||
request_dict = request_to_dict(db_request)
|
request_dict = request_to_dict(db_request)
|
||||||
request_dict["employee_name"] = f"{current_employee.last_name} {current_employee.first_name}"
|
request_dict["employee_name"] = f"{employee.last_name} {employee.first_name}"
|
||||||
|
|
||||||
# Отправляем уведомление в Telegram
|
# Отправляем уведомление в Telegram
|
||||||
notify_new_request(request_dict)
|
notify_new_request(request_dict)
|
||||||
@@ -73,17 +80,18 @@ def create_request(
|
|||||||
@router.get("/my", response_model=List[RequestResponse])
|
@router.get("/my", response_model=List[RequestResponse])
|
||||||
def get_employee_requests(
|
def get_employee_requests(
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
current_employee: Employee = Depends(get_current_employee)
|
current_employee: dict = Depends(get_current_employee)
|
||||||
):
|
):
|
||||||
"""Get employee's requests"""
|
"""Get employee's requests"""
|
||||||
try:
|
try:
|
||||||
requests = db.query(Request).filter(
|
requests = db.query(Request).filter(
|
||||||
Request.employee_id == current_employee.id
|
Request.employee_id == current_employee["id"]
|
||||||
).all()
|
).all()
|
||||||
|
|
||||||
# Преобразуем объекты в словари до закрытия сессии
|
# Преобразуем объекты в словари до закрытия сессии
|
||||||
return [request_to_dict(request) for request in requests]
|
return [request_to_dict(request) for request in requests]
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
logger.error(f"Error getting employee requests: {e}", exc_info=True)
|
||||||
raise HTTPException(status_code=500, detail=str(e))
|
raise HTTPException(status_code=500, detail=str(e))
|
||||||
|
|
||||||
@router.patch("/{request_id}/status", response_model=RequestResponse)
|
@router.patch("/{request_id}/status", response_model=RequestResponse)
|
||||||
|
Reference in New Issue
Block a user