Fix tests

backend/app/core/config.py

@@ -1,4 +1,5 @@
 """Settings configuration"""
+import os
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 class Settings(BaseSettings):
@@ -8,7 +9,8 @@ class Settings(BaseSettings):
     API_V1_STR: str = "/api"
     
     # Database
-    DATABASE_URL: str = "postgresql://postgres:postgres123@db:5432/support_db"
+    TESTING: bool = os.getenv("TESTING", "False") == "True"
+    DATABASE_URL: str = "sqlite:///./test.db" if TESTING else "postgresql://postgres:postgres123@postgres:5432/support_db"
     
     # JWT
     SECRET_KEY: str = "your-secret-key"

backend/app/database.py

@@ -2,7 +2,6 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from .core.config import settings
-from .db.base import Base
 
 # Для создания таблиц импортируем модели
 from .models.employee import Employee  # noqa
@@ -11,7 +10,13 @@ from .models.token import Token  # noqa
 
 SQLALCHEMY_DATABASE_URL = settings.DATABASE_URL
 
-engine = create_engine(SQLALCHEMY_DATABASE_URL)
+# Для SQLite нужны специальные параметры подключения
+connect_args = {"check_same_thread": False} if settings.DATABASE_URL.startswith("sqlite") else {}
+
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL,
+    connect_args=connect_args
+)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 def get_db():

backend/tests/conftest.py

@@ -8,16 +8,23 @@ from sqlalchemy.orm import sessionmaker
 from sqlalchemy.pool import StaticPool
 from unittest.mock import Mock, patch
 
-from app.database import Base, get_db
+from app.database import get_db
 from app.main import app
+from app.models.base import Base
 from app.models.employee import Employee
 from app.utils.auth import get_password_hash
 from app.utils.jwt import create_access_token
-from app.core.config import settings
+
+# Устанавливаем переменную окружения для тестов
+os.environ["TESTING"] = "True"
 
 # Создаем тестовую базу данных в памяти
-SQLALCHEMY_DATABASE_URL = "sqlite:///./test.db"
+SQLALCHEMY_DATABASE_URL = "sqlite:///:memory:"
-engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL,
+    connect_args={"check_same_thread": False},
+    poolclass=StaticPool
+)
 TestingSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 class MockRedis:
@@ -78,12 +85,11 @@ def client(db: TestingSessionLocal, redis_mock) -> Generator:
 def test_employee(db: TestingSessionLocal) -> Employee:
     """Фикстура для создания тестового сотрудника."""
     employee = Employee(
-        email="test@example.com",
+        first_name="Test",
-        full_name="Test Employee",
+        last_name="User",
-        hashed_password=get_password_hash("testpassword"),
+        department="IT",
-        is_active=True,
+        office="101",
-        is_admin=False,
+        hashed_password=get_password_hash("testpassword")
-        department="IT"
     )
     db.add(employee)
     db.commit()
@@ -94,12 +100,11 @@ def test_employee(db: TestingSessionLocal) -> Employee:
 def test_admin(db: TestingSessionLocal) -> Employee:
     """Фикстура для создания тестового администратора."""
     admin = Employee(
-        email="admin@example.com",
+        first_name="Admin",
-        full_name="Test Admin",
+        last_name="User",
-        hashed_password=get_password_hash("adminpassword"),
+        department="Administration",
-        is_active=True,
+        office="100",
-        is_admin=True,
+        hashed_password=get_password_hash("adminpassword")
-        department="Administration"
     )
     db.add(admin)
     db.commit()