mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
починка админки6
This commit is contained in:
@@ -5,17 +5,17 @@ from ..models.request import Request
|
|||||||
from ..schemas.request import RequestCreate, RequestUpdate
|
from ..schemas.request import RequestCreate, RequestUpdate
|
||||||
from ..utils.loggers import request_logger
|
from ..utils.loggers import request_logger
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
|
from enum import Enum
|
||||||
|
|
||||||
def create_request(db: Session, request: RequestCreate, employee_id: int):
|
def create_request(db: Session, request: RequestCreate, employee_id: int):
|
||||||
"""Create new request"""
|
"""Create new request"""
|
||||||
try:
|
try:
|
||||||
db_request = Request(
|
db_request = Request(
|
||||||
employee_id=employee_id,
|
title=request.title,
|
||||||
department=request.department,
|
|
||||||
request_type=request.request_type,
|
|
||||||
priority=request.priority,
|
|
||||||
description=request.description,
|
description=request.description,
|
||||||
status="new"
|
priority=request.priority.value,
|
||||||
|
status=request.status.value,
|
||||||
|
employee_id=employee_id
|
||||||
)
|
)
|
||||||
db.add(db_request)
|
db.add(db_request)
|
||||||
db.commit()
|
db.commit()
|
||||||
@@ -50,11 +50,9 @@ def get_request_details(db: Session, request_id: int):
|
|||||||
"employee_id": request.employee_id,
|
"employee_id": request.employee_id,
|
||||||
"employee_last_name": request.employee.last_name,
|
"employee_last_name": request.employee.last_name,
|
||||||
"employee_first_name": request.employee.first_name,
|
"employee_first_name": request.employee.first_name,
|
||||||
"department": request.department,
|
"title": request.title,
|
||||||
"office": request.employee.office,
|
|
||||||
"request_type": request.request_type,
|
|
||||||
"priority": request.priority,
|
|
||||||
"description": request.description,
|
"description": request.description,
|
||||||
|
"priority": request.priority,
|
||||||
"status": request.status,
|
"status": request.status,
|
||||||
"created_at": request.created_at.isoformat()
|
"created_at": request.created_at.isoformat()
|
||||||
}
|
}
|
||||||
@@ -79,6 +77,8 @@ def update_request(db: Session, request_id: int, request: RequestUpdate):
|
|||||||
|
|
||||||
update_data = request.model_dump(exclude_unset=True)
|
update_data = request.model_dump(exclude_unset=True)
|
||||||
for field, value in update_data.items():
|
for field, value in update_data.items():
|
||||||
|
if isinstance(value, Enum):
|
||||||
|
value = value.value
|
||||||
setattr(db_request, field, value)
|
setattr(db_request, field, value)
|
||||||
|
|
||||||
db.commit()
|
db.commit()
|
||||||
|
|||||||
Reference in New Issue
Block a user