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): rename orgmemberresponse.role_name to role (#12914)

Browse Source
This commit is contained in:
Hiep Le
2026-02-18 20:23:07 +07:00
committed by GitHub
parent 516721d1ee
commit b98bae8b5f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,7 +257,7 @@ class OrgMemberResponse(BaseModel):
user_id: str
email: str | None
role_id: int
role_name: str
role: str
role_rank: int
status: str | None

6
enterprise/server/services/org_member_service.py
View File

@@ -104,7 +104,7 @@ class OrgMemberService:
user_id=str(member.user_id),
email=user.email if user else None,
role_id=member.role_id,
role_name=role.name if role else '',
role=role.name if role else '',
role_rank=role.rank if role else 0,
status=member.status,
)
@@ -240,7 +240,7 @@ class OrgMemberService:
user_id=str(target_membership.user_id),
email=user.email if user else None,
role_id=target_membership.role_id,
role_name=target_role.name,
role=target_role.name,
role_rank=target_role.rank,
status=target_membership.status,
)
@@ -280,7 +280,7 @@ class OrgMemberService:
user_id=str(updated_member.user_id),
email=user.email if user else None,
role_id=updated_member.role_id,
role_name=new_role.name,
role=new_role.name,
role_rank=new_role.rank,
status=updated_member.status,
)

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

@@ -2013,7 +2013,7 @@ class TestGetOrgMembersEndpoint:
user_id=str(uuid.uuid4()),
email='user1@example.com',
role_id=1,
role_name='owner',
role='owner',
role_rank=10,
status='active',
)
@@ -2207,7 +2207,7 @@ class TestGetOrgMembersEndpoint:
user_id=str(uuid.uuid4()),
email='user2@example.com',
role_id=2,
role_name='admin',
role='admin',
role_rank=20,
status='active',
)
@@ -2543,7 +2543,7 @@ class TestUpdateOrgMemberEndpoint:
user_id=target_user_id,
email='user@example.com',
role_id=2,
role_name='admin',
role='admin',
role_rank=20,
status='active',
)

8
enterprise/tests/unit/server/services/test_org_member_service.py
View File

@@ -179,7 +179,7 @@ class TestOrgMemberServiceGetOrgMembers:
assert data.items[0].user_id == str(current_user_id)
assert data.items[0].email == 'test@example.com'
assert data.items[0].role_id == 1
assert data.items[0].role_name == 'owner'
assert data.items[0].role == 'owner'
assert data.items[0].role_rank == 10
assert data.items[0].status == 'active'
@@ -462,7 +462,7 @@ class TestOrgMemberServiceGetOrgMembers:
assert success is True
assert data is not None
assert len(data.items) == 1
assert data.items[0].role_name == ''
assert data.items[0].role == ''
assert data.items[0].role_rank == 0
@pytest.mark.asyncio
@@ -1099,7 +1099,7 @@ class TestOrgMemberServiceUpdateOrgMember:
# Assert
assert isinstance(data, OrgMemberResponse)
assert data.role_name == 'admin'
assert data.role == 'admin'
assert data.role_rank == 20
mock_update.assert_called_once_with(org_id, target_user_id, admin_role.id)
@@ -1431,7 +1431,7 @@ class TestOrgMemberServiceUpdateOrgMember:
# Assert
assert data is not None
assert data.role_name == 'member'
assert data.role == 'member'
assert data.role_rank == 1000