further fixes

Author: HardMax71

backend/app/services/user_settings_service.py

@@ -393,13 +393,13 @@ def parse_value(val: object) -> object:
         if "notifications" in upd:
             n = parse_value(upd["notifications"])
             if isinstance(n, dict):
-                channels: list[NotificationChannel] = [NotificationChannel(c) for c in n.get("channels", [])]
+                notif_channels: list[NotificationChannel] = [NotificationChannel(c) for c in n.get("channels", [])]
                 settings.notifications = DomainNotificationSettings(
                     execution_completed=n.get("execution_completed", settings.notifications.execution_completed),
                     execution_failed=n.get("execution_failed", settings.notifications.execution_failed),
                     system_updates=n.get("system_updates", settings.notifications.system_updates),
                     security_alerts=n.get("security_alerts", settings.notifications.security_alerts),
-                    channels=channels or settings.notifications.channels,
+                    channels=notif_channels or settings.notifications.channels,
                 )
         if "editor" in upd:
             e = parse_value(upd["editor"])

backend/tests/conftest.py

@@ -127,13 +127,16 @@ def create_test_app():
 
 # ===== App without lifespan for tests =====
 @pytest_asyncio.fixture(scope="session")
-async def app():
+async def app(_test_env):  # type: ignore[valid-type]
     """Create FastAPI app once per session/worker.
 
     Session-scoped to avoid Pydantic schema validator memory issues when
     FastAPI recreates OpenAPI schemas hundreds of times with pytest-xdist.
     See: https://github.com/pydantic/pydantic/issues/1864
 
+    Depends on _test_env to ensure env vars (REDIS_DB, DATABASE_NAME, etc.)
+    are set before the app/Settings are created.
+
     Note: Tests must not modify app.state or registered routes.
     Use function-scoped `client` fixture for test isolation.
     """

backend/tests/integration/conftest.py

@@ -11,11 +11,16 @@ async def _cleanup(db: Database, redis_client: redis.Redis):
 
     Only pre-test cleanup - post-test cleanup causes event loop issues
     when SSE/streaming tests hold connections across loop boundaries.
+
+    NOTE: With pytest-xdist, each worker uses a separate Redis database
+    (gw0→db0, gw1→db1, etc.), so flushdb() is safe and only affects
+    that worker's database. See tests/conftest.py for REDIS_DB setup.
     """
     collections = await db.list_collection_names()
     for name in collections:
         if not name.startswith("system."):
             await db.drop_collection(name)
+
     await redis_client.flushdb()
 
     yield