github/OpenHands
1
0
Fork 0
mirror of https://github.com/OpenHands/OpenHands.git synced 2026-03-22 13:47:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(backend): allow deleting an organization after recent changes (#13200)

Browse Source
This commit is contained in:
Hiep Le
2026-03-05 01:52:33 +07:00
committed by GitHub
parent 039e208167
commit eeac9f14a3
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
enterprise/storage/org_store.py
View File

@@ -292,7 +292,7 @@ class OrgStore:
text("""
DELETE FROM app_conversation_start_task
WHERE app_conversation_id IN (
SELECT conversation_id FROM conversation_metadata_saas WHERE org_id = :org_id
SELECT conversation_id::uuid FROM conversation_metadata_saas WHERE org_id = :org_id
)
"""),
{'org_id': str(org_id)},
@@ -352,13 +352,13 @@ class OrgStore:
# Batch update: reassign current_org_id to an alternative org for all affected users
await session.execute(
text("""
UPDATE user
UPDATE "user"
SET current_org_id = (
SELECT om.org_id FROM org_member om
WHERE om.user_id = user.id AND om.org_id != :org_id
WHERE om.user_id = "user".id AND om.org_id != :org_id
LIMIT 1
)
WHERE user.current_org_id = :org_id
WHERE "user".current_org_id = :org_id
"""),
{'org_id': str(org_id)},
)

3
enterprise/tests/unit/test_org_store.py
View File

@@ -444,6 +444,9 @@ async def test_persist_org_with_owner_with_multiple_fields(
@pytest.mark.asyncio
@pytest.mark.skip(
reason='Uses PostgreSQL-specific ::uuid cast syntax not supported by SQLite'
)
async def test_delete_org_cascade_success(async_session_maker, mock_litellm_api):
"""
GIVEN: Valid organization with associated data