Fix database

backend/tests/test_fixtures.py

@@ -12,53 +12,73 @@ from app.models.employee import Employee
 @pytest.fixture(scope="function")
 def test_employee(db_session: Session) -> Employee:
     """Create test employee"""
-    # Удаляем существующего сотрудника, если есть
-    db_session.query(Employee).filter(
-        Employee.first_name == "Test",
-        Employee.last_name == "User"
-    ).delete()
-    db_session.commit()
-
-    employee = EmployeeCreate(
-        first_name="Test",
-        last_name="User",
-        department="IT",
-        office="101",
-        password="testpass123",
-        is_admin=False
-    )
-    hashed_password = get_password_hash(employee.password)
-    db_employee = employees.create_employee(db_session, employee, hashed_password)
-    return db_employee
+    try:
+        # Удаляем существующего сотрудника, если есть
+        db_session.query(Employee).filter(
+            Employee.first_name == "Test",
+            Employee.last_name == "User"
+        ).delete(synchronize_session=False)
+        
+        employee = EmployeeCreate(
+            first_name="Test",
+            last_name="User",
+            department="IT",
+            office="101",
+            password="testpass123",
+            is_admin=False
+        )
+        hashed_password = get_password_hash(employee.password)
+        db_employee = employees.create_employee(db_session, employee, hashed_password)
+        db_session.commit()
+        return db_employee
+    except Exception:
+        db_session.rollback()
+        raise
 
 @pytest.fixture(scope="function")
 def test_admin(db_session: Session) -> Employee:
     """Create test admin"""
-    # Удаляем существующего админа, если есть
-    db_session.query(Employee).filter(
-        Employee.first_name == "Admin",
-        Employee.last_name == "User"
-    ).delete()
-    db_session.commit()
-
-    admin = EmployeeCreate(
-        first_name="Admin",
-        last_name="User",
-        department="IT",
-        office="102",
-        password="adminpass123",
-        is_admin=True
-    )
-    hashed_password = get_password_hash(admin.password)
-    db_admin = employees.create_employee(db_session, admin, hashed_password)
-    return db_admin
+    try:
+        # Удаляем существующего админа, если есть
+        db_session.query(Employee).filter(
+            Employee.first_name == "Admin",
+            Employee.last_name == "User"
+        ).delete(synchronize_session=False)
+        
+        admin = EmployeeCreate(
+            first_name="Admin",
+            last_name="User",
+            department="IT",
+            office="102",
+            password="adminpass123",
+            is_admin=True
+        )
+        hashed_password = get_password_hash(admin.password)
+        db_admin = employees.create_employee(db_session, admin, hashed_password)
+        db_session.commit()
+        return db_admin
+    except Exception:
+        db_session.rollback()
+        raise
 
 @pytest.fixture(scope="function")
 def employee_token(db_session: Session, test_employee: Employee) -> str:
     """Get employee token"""
-    return create_and_save_token(test_employee.id, db_session)
+    try:
+        token = create_and_save_token(test_employee.id, db_session)
+        db_session.commit()
+        return token
+    except Exception:
+        db_session.rollback()
+        raise
 
 @pytest.fixture(scope="function")
 def admin_token(db_session: Session, test_admin: Employee) -> str:
     """Get admin token"""
-    return create_and_save_token(test_admin.id, db_session) 
+    try:
+        token = create_and_save_token(test_admin.id, db_session)
+        db_session.commit()
+        return token
+    except Exception:
+        db_session.rollback()
+        raise