Open-source AI teammates in Slack, Teams, Discord, Telegram and Mattermost. Self-host it, with any agent harness and any model.
Python agent-orchestrationaiai-agentschatopsdiscordlangchainmcpmicrosoft-teamsmulti-agentopen-sourceopenaiself-hostedslack
fix(collab): detach dependent rooms before removing a bridge (#35)
Christian McDermott88d1c7647436
diff --git a/core/switch_core/bridges/collaboration/lifecycle_service.py b/core/switch_core/bridges/collaboration/lifecycle_service.pyindex eae33d03a..0986b5cbf 100644--- a/core/switch_core/bridges/collaboration/lifecycle_service.py+++ b/core/switch_core/bridges/collaboration/lifecycle_service.py@@ -237,6 +237,17 @@ class CollaborationBridgeLifecycleService:async def remove(self, bridge_id: str) -> None:await self.stop(bridge_id)async with self._session_factory() as session:+ dependent_rooms = await self._room_store.get_by_bridge(session, bridge_id)+ if dependent_rooms:+ logger.warning(+ "Detaching %d room(s) from collaboration bridge %s before removal; "+ "they will become internal-only rooms: %s",+ len(dependent_rooms),+ bridge_id,+ ", ".join(room.id for room in dependent_rooms),+ )+ for room in dependent_rooms:+ await self._room_store.clear_bridge(session, room.id)await self._external_user_store.delete_by_bridge(session, bridge_id)await self._bridge_store.delete(session, bridge_id)await session.commit()diff --git a/core/tests/switch_core/bridges/collaboration/test_lifecycle_remove.py b/core/tests/switch_core/bridges/collaboration/test_lifecycle_remove.pynew file mode 100644index 000000000..705066c53--- /dev/null+++ b/core/tests/switch_core/bridges/collaboration/test_lifecycle_remove.py@@ -0,0 +1,135 @@+from __future__ import annotations++import uuid+from unittest.mock import MagicMock++import pytest+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker++from switch_core.bridges.collaboration.lifecycle_service import (+ CollaborationBridgeLifecycleService,+)+from switch_core.db.models import Client, CollaborationBridge, ExternalUser, Room+from switch_core.db.stores.collaboration_bridge_store import CollaborationBridgeStore+from switch_core.db.stores.external_user_store import ExternalUserStore+from switch_core.db.stores.room_store import RoomStore+++def _service(+ session_factory: async_sessionmaker[AsyncSession],+) -> CollaborationBridgeLifecycleService:+ """Build the service with real stores; mock the deps remove() never touches."""+ return CollaborationBridgeLifecycleService(+ bridge_store=CollaborationBridgeStore(),+ external_user_store=ExternalUserStore(),+ bridge_message_map_store=MagicMock(),+ room_store=RoomStore(),+ agent_store=MagicMock(),+ client_store=MagicMock(),+ client_lifecycle=MagicMock(),+ room_service=MagicMock(),+ matrix_admin=MagicMock(),+ session_factory=session_factory,+ config=MagicMock(),+ )+++async def _make_client(session: AsyncSession, *, client_type: str) -> str:+ client = Client(+ matrix_user_id=f"@{client_type}-{uuid.uuid4().hex[:8]}:test",+ display_name=f"{client_type} client",+ type=client_type,+ password="x",+ )+ session.add(client)+ await session.flush()+ return client.id+++async def _make_bridge(session: AsyncSession) -> str:+ client_id = await _make_client(session, client_type="bridge")+ bridge = CollaborationBridge(+ type="mattermost",+ display_name="MM",+ client_id=client_id,+ status="active",+ )+ session.add(bridge)+ await session.flush()+ return bridge.id+++async def _make_bridged_room(session: AsyncSession, *, bridge_id: str) -> str:+ room = Room(+ matrix_room_id=f"!{uuid.uuid4().hex[:8]}:test",+ name="bridged room",+ description="mirror of an external channel",+ bridge_id=bridge_id,+ channel_type="channel_public",+ external_channel_id="C123",+ )+ session.add(room)+ await session.flush()+ return room.id+++async def _make_external_user(session: AsyncSession, *, bridge_id: str) -> str:+ client_id = await _make_client(session, client_type="external_user")+ user = ExternalUser(+ bridge_id=bridge_id,+ external_user_id=f"U{uuid.uuid4().hex[:8]}",+ external_username="alice",+ client_id=client_id,+ )+ session.add(user)+ await session.flush()+ return user.id+++async def test_remove_detaches_dependent_rooms(+ session_factory: async_sessionmaker[AsyncSession],+) -> None:+ """Removing a bridge that still has dependent rooms must not FK-violate.++ Regression for the DELETE /collab/bridges 500: rooms.bridge_id references+ collaboration_bridges.id with no ON DELETE rule, so deleting the bridge+ while rooms point at it raised a raw FK error. remove() now detaches the+ rooms (non-destructive) before deleting the bridge.+ """+ service = _service(session_factory)+ async with session_factory() as session:+ bridge_id = await _make_bridge(session)+ room_id = await _make_bridged_room(session, bridge_id=bridge_id)+ external_user_id = await _make_external_user(session, bridge_id=bridge_id)+ await session.commit()++ await service.remove(bridge_id)++ async with session_factory() as session:+ assert await CollaborationBridgeStore().get(session, bridge_id) is None++ # Room survives, just detached from the (now-gone) bridge.+ room = await RoomStore().get(session, room_id)+ assert room is not None+ assert room.bridge_id is None+ assert room.channel_type is None+ assert room.external_channel_id is None++ # External users for the bridge are cleaned up (pre-existing behavior).+ assert await ExternalUserStore().get(session, external_user_id) is None+++async def test_remove_without_dependent_rooms_still_deletes(+ session_factory: async_sessionmaker[AsyncSession],+) -> None:+ service = _service(session_factory)+ async with session_factory() as session:+ bridge_id = await _make_bridge(session)+ await session.commit()++ await service.remove(bridge_id)++ async with session_factory() as session:+ assert await CollaborationBridgeStore().get(session, bridge_id) is None