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

refactor(backend): include current_org_id in organization list response (#12915)

Browse Source
This commit is contained in:
Hiep Le
2026-02-18 20:35:40 +07:00
committed by GitHub
parent b98bae8b5f
commit ac76e10048
3 changed files with 151 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
enterprise/server/routes/org_models.py
View File

@@ -214,6 +214,7 @@ class OrgPage(BaseModel):
items: list[OrgResponse]
next_page_id: str | None = None
current_org_id: str | None = None
class OrgUpdate(BaseModel):

13
enterprise/server/routes/orgs.py
View File

@@ -32,6 +32,7 @@ from server.routes.org_models import (
)
from server.services.org_member_service import OrgMemberService
from storage.org_service import OrgService
from storage.user_store import UserStore
from openhands.core.logger import openhands_logger as logger
from openhands.server.user_auth import get_user_id
@@ -78,6 +79,12 @@ async def list_user_orgs(
)
try:
# Fetch user to get current_org_id
user = await UserStore.get_user_by_id_async(user_id)
current_org_id = (
str(user.current_org_id) if user and user.current_org_id else None
)
# Fetch organizations from service layer
orgs, next_page_id = OrgService.get_user_orgs_paginated(
user_id=user_id,
@@ -99,7 +106,11 @@ async def list_user_orgs(
},
)
return OrgPage(items=org_responses, next_page_id=next_page_id)
return OrgPage(
items=org_responses,
next_page_id=next_page_id,
current_org_id=current_org_id,
)
except Exception as e:
logger.exception(

162
enterprise/tests/unit/server/routes/test_orgs.py
View File

@@ -513,10 +513,18 @@ async def test_list_user_orgs_success(mock_app_list):
org_version=5,
default_llm_model='claude-opus-4-5-20251101',
)
mock_user = MagicMock()
mock_user.current_org_id = org_id
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([mock_org], None),
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([mock_org], None),
),
):
client = TestClient(mock_app_list)
@@ -536,6 +544,54 @@ async def test_list_user_orgs_success(mock_app_list):
assert response_data['items'][0]['credits'] is None
@pytest.mark.asyncio
async def test_list_user_orgs_returns_current_org_id(mock_app_list):
"""
GIVEN: User has a current organization set
WHEN: GET /api/organizations is called
THEN: Response includes current_org_id matching the user's current org
"""
# Arrange
current_org_id = uuid.uuid4()
other_org_id = uuid.uuid4()
current_org = Org(
id=current_org_id,
name='Current Organization',
contact_name='John Doe',
contact_email='john@example.com',
)
other_org = Org(
id=other_org_id,
name='Other Organization',
contact_name='Jane Doe',
contact_email='jane@example.com',
)
mock_user = MagicMock()
mock_user.current_org_id = current_org_id
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([current_org, other_org], None),
),
):
client = TestClient(mock_app_list)
# Act
response = client.get('/api/organizations')
# Assert
assert response.status_code == status.HTTP_200_OK
response_data = response.json()
assert 'current_org_id' in response_data
assert response_data['current_org_id'] == str(current_org_id)
@pytest.mark.asyncio
async def test_list_user_orgs_with_pagination(mock_app_list):
"""
@@ -556,10 +612,18 @@ async def test_list_user_orgs_with_pagination(mock_app_list):
contact_name='Jane Doe',
contact_email='jane@example.com',
)
mock_user = MagicMock()
mock_user.current_org_id = org1.id
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([org1, org2], '2'),
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([org1, org2], '2'),
),
):
client = TestClient(mock_app_list)
@@ -583,9 +647,18 @@ async def test_list_user_orgs_empty(mock_app_list):
THEN: Empty list is returned with 200 status
"""
# Arrange
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([], None),
mock_user = MagicMock()
mock_user.current_org_id = uuid.uuid4()
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([], None),
),
):
client = TestClient(mock_app_list)
@@ -641,9 +714,18 @@ async def test_list_user_orgs_service_error(mock_app_list):
THEN: 500 Internal Server Error is returned
"""
# Arrange
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
side_effect=Exception('Database error'),
mock_user = MagicMock()
mock_user.current_org_id = uuid.uuid4()
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
side_effect=Exception('Database error'),
),
):
client = TestClient(mock_app_list)
@@ -698,10 +780,18 @@ async def test_list_user_orgs_personal_org_identified(mock_app_list):
contact_name='John Doe',
contact_email='john@example.com',
)
mock_user = MagicMock()
mock_user.current_org_id = personal_org_id
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([personal_org], None),
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([personal_org], None),
),
):
client = TestClient(mock_app_list)
@@ -729,10 +819,18 @@ async def test_list_user_orgs_team_org_identified(mock_app_list):
contact_name='John Doe',
contact_email='john@example.com',
)
mock_user = MagicMock()
mock_user.current_org_id = team_org.id
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([team_org], None),
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([team_org], None),
),
):
client = TestClient(mock_app_list)
@@ -770,10 +868,18 @@ async def test_list_user_orgs_mixed_personal_and_team(mock_app_list):
contact_name='Jane Doe',
contact_email='jane@example.com',
)
mock_user = MagicMock()
mock_user.current_org_id = personal_org_id
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([personal_org, team_org], None),
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([personal_org, team_org], None),
),
):
client = TestClient(mock_app_list)
@@ -834,10 +940,18 @@ async def test_list_user_orgs_all_fields_present(mock_app_list):
enable_solvability_analysis=True,
v1_enabled=True,
)
mock_user = MagicMock()
mock_user.current_org_id = org_id
with patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([mock_org], None),
with (
patch(
'server.routes.orgs.UserStore.get_user_by_id_async',
AsyncMock(return_value=mock_user),
),
patch(
'server.routes.orgs.OrgService.get_user_orgs_paginated',
return_value=([mock_org], None),
),
):
client = TestClient(mock_app_list)