Skip to content

πŸ™Œ OpenHands: AI-Driven Development

refactor(backend): rename orgmemberresponse.role_name to role (#12914)

Hiep Leb98bae8b5ff8
diff --git a/enterprise/server/routes/org_models.py b/enterprise/server/routes/org_models.py
index de666be134..c9825f8ddb 100644
--- a/enterprise/server/routes/org_models.py
+++ b/enterprise/server/routes/org_models.py
@@ -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
diff --git a/enterprise/server/services/org_member_service.py b/enterprise/server/services/org_member_service.py
index d6afe26bac..d17460c9f7 100644
--- a/enterprise/server/services/org_member_service.py
+++ b/enterprise/server/services/org_member_service.py
@@ -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,
)
diff --git a/enterprise/tests/unit/server/routes/test_orgs.py b/enterprise/tests/unit/server/routes/test_orgs.py
index 5d95e28892..9faa2f9693 100644
--- a/enterprise/tests/unit/server/routes/test_orgs.py
+++ b/enterprise/tests/unit/server/routes/test_orgs.py
@@ -2013,7 +2013,7 @@ class TestGetOrgMembersEndpoint:
user_id=str(uuid.uuid4()),
role_id=1,
- role_name='owner',
+ role='owner',
role_rank=10,
status='active',
)
@@ -2207,7 +2207,7 @@ class TestGetOrgMembersEndpoint:
user_id=str(uuid.uuid4()),
role_id=2,
- role_name='admin',
+ role='admin',
role_rank=20,
status='active',
)
@@ -2543,7 +2543,7 @@ class TestUpdateOrgMemberEndpoint:
user_id=target_user_id,
role_id=2,
- role_name='admin',
+ role='admin',
role_rank=20,
status='active',
)
diff --git a/enterprise/tests/unit/server/services/test_org_member_service.py b/enterprise/tests/unit/server/services/test_org_member_service.py
index 8a16a10e01..4f6bca0f74 100644
--- a/enterprise/tests/unit/server/services/test_org_member_service.py
+++ b/enterprise/tests/unit/server/services/test_org_member_service.py
@@ -179,7 +179,7 @@ class TestOrgMemberServiceGetOrgMembers:
assert data.items[0].user_id == str(current_user_id)
assert data.items[0].email == '[email protected]'
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