Fix database

backend/app/core/test_config.py

@@ -1,4 +1,5 @@
 """Test configuration"""
+import os
 from pydantic_settings import BaseSettings
 
 class TestSettings(BaseSettings):
@@ -8,7 +9,7 @@ class TestSettings(BaseSettings):
     # Database
     POSTGRES_USER: str = "postgres"
     POSTGRES_PASSWORD: str = "postgres"
-    POSTGRES_HOST: str = "localhost"
+    POSTGRES_HOST: str = os.getenv("POSTGRES_HOST", "localhost")
     POSTGRES_PORT: str = "5432"
     POSTGRES_DB: str = "test_app"
     
@@ -33,6 +34,9 @@ class TestSettings(BaseSettings):
 
     def get_database_url(self) -> str:
         """Get database URL"""
-        return f"postgresql://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
+        return os.getenv(
+            "DATABASE_URL",
+            f"postgresql://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
+        )
 
 test_settings = TestSettings() 

backend/tests/conftest.py

@@ -24,24 +24,15 @@ TestingSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engin
 @pytest.fixture(scope="session", autouse=True)
 def setup_test_db() -> Generator[None, Any, None]:
     """Setup test database"""
-    # Пробуем создать базу данных test_app
-    default_engine = create_engine(f"postgresql://{test_settings.POSTGRES_USER}:{test_settings.POSTGRES_PASSWORD}@{test_settings.POSTGRES_HOST}:{test_settings.POSTGRES_PORT}/postgres")
-    with default_engine.connect() as conn:
-        conn.execute(text("COMMIT"))  # Завершаем текущую транзакцию
-        try:
-            conn.execute(text("DROP DATABASE IF EXISTS test_app"))
-            conn.execute(text("CREATE DATABASE test_app"))
-        except Exception as e:
-            print(f"Error creating database: {e}")
-    
-    # Создаем все таблицы
-    Base.metadata.create_all(bind=engine)
-    yield
-    # Удаляем все таблицы
-    Base.metadata.drop_all(bind=engine)
-    
-    # Закрываем соединение с тестовой базой
-    engine.dispose()
+    try:
+        # Создаем все таблицы
+        Base.metadata.create_all(bind=engine)
+        yield
+    finally:
+        # Удаляем все таблицы
+        Base.metadata.drop_all(bind=engine)
+        # Закрываем соединение с тестовой базой
+        engine.dispose()
 
 @pytest.fixture
 def db_session() -> Generator[Any, Any, None]: