mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
Fix: Admin autorization
This commit is contained in:
@@ -1,13 +1,9 @@
|
||||
"""Employee CRUD operations"""
|
||||
from typing import Optional, Dict, Any
|
||||
from sqlalchemy.orm import Session
|
||||
from typing import List, Optional
|
||||
from ..models.employee import Employee
|
||||
from ..schemas.employee import EmployeeCreate, EmployeeUpdate
|
||||
from ..utils.loggers import auth_logger
|
||||
|
||||
def get_employees(db: Session, skip: int = 0, limit: int = 100) -> List[Employee]:
|
||||
"""Get all employees"""
|
||||
return db.query(Employee).offset(skip).limit(limit).all()
|
||||
from ..models.employee import Employee
|
||||
from ..utils.security import get_password_hash
|
||||
|
||||
def get_employee(db: Session, employee_id: int) -> Optional[Employee]:
|
||||
"""Get employee by ID"""
|
||||
@@ -20,35 +16,49 @@ def get_employee_by_credentials(db: Session, first_name: str, last_name: str) ->
|
||||
Employee.last_name == last_name
|
||||
).first()
|
||||
|
||||
def create_employee(db: Session, employee: EmployeeCreate, hashed_password: str) -> Employee:
|
||||
def get_employee_by_login(db: Session, login: str) -> Optional[Employee]:
|
||||
"""Get employee by login"""
|
||||
return db.query(Employee).filter(Employee.login == login).first()
|
||||
|
||||
def get_employees(db: Session, skip: int = 0, limit: int = 100):
|
||||
"""Get list of employees"""
|
||||
return db.query(Employee).offset(skip).limit(limit).all()
|
||||
|
||||
def create_employee(db: Session, employee_data: Dict[str, Any]) -> Employee:
|
||||
"""Create new employee"""
|
||||
# Хешируем пароль
|
||||
hashed_password = get_password_hash(employee_data["password"])
|
||||
|
||||
# Создаем сотрудника
|
||||
db_employee = Employee(
|
||||
first_name=employee.first_name,
|
||||
last_name=employee.last_name,
|
||||
department=employee.department,
|
||||
office=employee.office,
|
||||
login=employee_data.get("login"),
|
||||
first_name=employee_data["first_name"],
|
||||
last_name=employee_data["last_name"],
|
||||
department=employee_data["department"],
|
||||
office=employee_data["office"],
|
||||
hashed_password=hashed_password,
|
||||
is_admin=employee.is_admin
|
||||
is_admin=employee_data.get("is_admin", False)
|
||||
)
|
||||
db.add(db_employee)
|
||||
db.commit()
|
||||
db.refresh(db_employee)
|
||||
return db_employee
|
||||
|
||||
def update_employee(db: Session, employee_id: int, employee: EmployeeUpdate) -> Optional[Employee]:
|
||||
"""Update employee data"""
|
||||
db_employee = get_employee(db, employee_id)
|
||||
if db_employee:
|
||||
for key, value in employee.dict(exclude_unset=True).items():
|
||||
setattr(db_employee, key, value)
|
||||
db.commit()
|
||||
db.refresh(db_employee)
|
||||
return db_employee
|
||||
def update_employee(db: Session, employee: Employee, employee_data: Dict[str, Any]) -> Employee:
|
||||
"""Update employee"""
|
||||
# Если есть пароль в данных, хешируем его
|
||||
if "password" in employee_data:
|
||||
employee_data["hashed_password"] = get_password_hash(employee_data.pop("password"))
|
||||
|
||||
# Обновляем поля
|
||||
for field, value in employee_data.items():
|
||||
setattr(employee, field, value)
|
||||
|
||||
db.commit()
|
||||
db.refresh(employee)
|
||||
return employee
|
||||
|
||||
def delete_employee(db: Session, employee_id: int) -> Optional[Employee]:
|
||||
def delete_employee(db: Session, employee: Employee) -> None:
|
||||
"""Delete employee"""
|
||||
db_employee = get_employee(db, employee_id)
|
||||
if db_employee:
|
||||
db.delete(db_employee)
|
||||
db.commit()
|
||||
return db_employee
|
||||
db.delete(employee)
|
||||
db.commit()
|
Reference in New Issue
Block a user