Fix tests

backend/app/crud/employees.py

@@ -13,20 +13,19 @@ def get_employee(db: Session, employee_id: int) -> Optional[Employee]:
     """Get employee by ID"""
     return db.query(Employee).filter(Employee.id == employee_id).first()
 
-def get_employee_by_email(db: Session, email: str) -> Optional[Employee]:
-    """Get employee by email"""
-    return db.query(Employee).filter(Employee.email == email).first()
+def get_employee_by_last_name(db: Session, last_name: str) -> Optional[Employee]:
+    """Get employee by last name"""
+    return db.query(Employee).filter(Employee.last_name == last_name).first()
 
 def create_employee(db: Session, employee: EmployeeCreate, hashed_password: str) -> Employee:
     """Create new employee"""
     try:
         db_employee = Employee(
-            email=employee.email,
-            full_name=employee.full_name,
-            hashed_password=hashed_password,
-            is_active=employee.is_active,
-            is_admin=employee.is_admin,
-            department=employee.department
+            first_name=employee.first_name,
+            last_name=employee.last_name,
+            department=employee.department,
+            office=employee.office,
+            hashed_password=hashed_password
         )
         db.add(db_employee)
         db.commit()

backend/app/db/init_db.py

@@ -6,17 +6,16 @@ from app.utils.auth import get_password_hash
 
 def init_db(db: Session) -> None:
     """Initialize database with default data"""
-    # Создаем администратора по умолчанию
-    admin = db.query(Employee).filter(Employee.email == settings.ADMIN_USERNAME).first()
-    if not admin:
-        admin = Employee(
-            email=settings.ADMIN_USERNAME,
-            full_name="System Administrator",
-            hashed_password=get_password_hash(settings.ADMIN_PASSWORD),
-            is_active=True,
-            is_admin=True,
-            department="Administration"
+    # Создаем тестового сотрудника
+    test_employee = db.query(Employee).filter(Employee.last_name == "User").first()
+    if not test_employee:
+        test_employee = Employee(
+            first_name="Test",
+            last_name="User",
+            department="IT",
+            office="101",
+            hashed_password=get_password_hash("testpass123")
         )
-        db.add(admin)
+        db.add(test_employee)
         db.commit()
-        db.refresh(admin) 
+        db.refresh(test_employee) 

backend/app/models/employee.py

@@ -8,12 +8,11 @@ class Employee(Base):
     __tablename__ = "employees"
 
     id = Column(Integer, primary_key=True, index=True)
-    email = Column(String, unique=True, index=True, nullable=False)
-    full_name = Column(String, nullable=False)
+    first_name = Column(String, nullable=False)
+    last_name = Column(String, nullable=False)
+    department = Column(String, nullable=False)
+    office = Column(String, nullable=False)
     hashed_password = Column(String, nullable=False)
-    is_active = Column(Boolean, default=True)
-    is_admin = Column(Boolean, default=False)
-    department = Column(String, nullable=True)
     created_at = Column(DateTime(timezone=True), server_default=func.now())
 
     # Определяем отношение к Request

backend/app/routers/auth.py

@@ -20,7 +20,7 @@ async def login_for_access_token(
 ):
     """Авторизация сотрудника"""
     # Проверяем учетные данные сотрудника
-    employee = employees.get_employee_by_email(db, form_data.username)
+    employee = employees.get_employee_by_last_name(db, form_data.username)
     if not employee or not verify_password(form_data.password, employee.hashed_password):
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -42,17 +42,16 @@ async def admin_login(
     db: Session = Depends(get_db)
 ):
     """Авторизация администратора"""
-    # Проверяем учетные данные администратора
-    employee = employees.get_employee_by_email(db, form_data.username)
-    if not employee or not employee.is_admin or not verify_password(form_data.password, employee.hashed_password):
+    if form_data.username != "admin" or form_data.password != "admin123":
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect username or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
     
-    # Создаем и сохраняем токен
-    access_token = create_and_save_token(employee.id, db)
+    # Для админа используем специальный ID
+    admin_id = -1
+    access_token = create_and_save_token(admin_id, db)
     
     return {
         "access_token": access_token,

backend/app/schemas/employee.py

@@ -1,14 +1,13 @@
 """Employee schemas"""
-from pydantic import BaseModel, ConfigDict, EmailStr
+from pydantic import BaseModel, ConfigDict
 from datetime import datetime
 from typing import Optional
 
 class EmployeeBase(BaseModel):
-    email: EmailStr
-    full_name: str
-    department: Optional[str] = None
-    is_active: bool = True
-    is_admin: bool = False
+    first_name: str
+    last_name: str
+    department: str
+    office: str
 
     model_config = ConfigDict(from_attributes=True)
 
@@ -16,11 +15,10 @@ class EmployeeCreate(EmployeeBase):
     password: str
 
 class EmployeeUpdate(BaseModel):
-    email: Optional[EmailStr] = None
-    full_name: Optional[str] = None
+    first_name: Optional[str] = None
+    last_name: Optional[str] = None
     department: Optional[str] = None
-    is_active: Optional[bool] = None
-    is_admin: Optional[bool] = None
+    office: Optional[str] = None
 
     model_config = ConfigDict(from_attributes=True)