mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
Fix tests
This commit is contained in:
@@ -8,13 +8,7 @@ from . import employees
|
||||
|
||||
def create_request(db: Session, request: RequestCreate, employee_id: int) -> Request:
|
||||
"""Create new request"""
|
||||
# Получаем данные сотрудника
|
||||
employee = employees.get_employee(db, employee_id)
|
||||
if not employee:
|
||||
raise ValueError("Employee not found")
|
||||
|
||||
db_request = Request(
|
||||
department=employee.department, # Берем отдел из данных сотрудника
|
||||
request_type=request.request_type,
|
||||
description=request.description,
|
||||
priority=request.priority,
|
||||
@@ -30,27 +24,6 @@ def get_request(db: Session, request_id: int) -> Optional[Request]:
|
||||
"""Get request by ID"""
|
||||
return db.query(Request).filter(Request.id == request_id).first()
|
||||
|
||||
def get_request_details(db: Session, request_id: int) -> Optional[Dict]:
|
||||
"""Get detailed request information including employee data"""
|
||||
request = get_request(db, request_id)
|
||||
if not request:
|
||||
return None
|
||||
|
||||
employee = employees.get_employee(db, request.employee_id)
|
||||
if not employee:
|
||||
return None
|
||||
|
||||
return {
|
||||
"id": request.id,
|
||||
"request_type": request.request_type,
|
||||
"description": request.description,
|
||||
"priority": request.priority,
|
||||
"status": request.status,
|
||||
"department": request.department,
|
||||
"created_at": request.created_at.isoformat(),
|
||||
"employee_full_name": employee.full_name
|
||||
}
|
||||
|
||||
def get_employee_requests(db: Session, employee_id: int) -> list[Request]:
|
||||
"""Get employee's requests"""
|
||||
return db.query(Request).filter(Request.employee_id == employee_id).all()
|
||||
@@ -80,12 +53,6 @@ def get_statistics(db: Session) -> Dict:
|
||||
func.count(Request.id)
|
||||
).group_by(Request.status).all()
|
||||
)
|
||||
|
||||
# Добавляем статусы с нулевым количеством
|
||||
for status in RequestStatus:
|
||||
if status not in by_status:
|
||||
by_status[status] = 0
|
||||
|
||||
return {
|
||||
"total": total,
|
||||
"by_status": by_status
|
||||
|
Reference in New Issue
Block a user