fix: fix response

This commit is contained in:
fatelei
2026-05-19 15:40:36 +08:00
parent fafdc56f2c
commit 7c6d3e187f
2 changed files with 10 additions and 17 deletions

View File

@@ -1202,10 +1202,9 @@ class RBACService:
account_id=account_id,
json={"account_ids": member_account_ids},
)
if isinstance(data, list):
items = data
else:
items = (data or {}).get("data") or []
items = []
if isinstance(data, dict):
items = [{"account_id": account_id, "roles": roles} for account_id, roles in data.items()]
rst = []
for item in items:
tmp = MemberRolesResponse.model_validate(item)

View File

@@ -488,19 +488,11 @@ class TestMemberRoles:
def test_batch_get(self, mock_send: MagicMock):
mock_send.return_value = {
"data": [
{
"account_id": "acct-2",
"roles": [
{"id": "role-1", "name": "Admin"},
{"id": "role-2", "name": "Editor"},
],
},
{
"account_id": "acct-3",
"roles": [],
},
]
"acct-2": [
{"id": "role-1", "name": "Admin"},
{"id": "role-2", "name": "Editor"},
],
"acct-3": [],
}
out = svc.RBACService.MemberRoles.batch_get("tenant-1", "acct-1", ["acct-2", "acct-3"])
@@ -511,6 +503,8 @@ class TestMemberRoles:
assert call.json == {"account_ids": ["acct-2", "acct-3"]}
assert out[0].account_id == "acct-2"
assert len(out[0].roles) == 2
assert out[1].account_id == "acct-3"
assert out[1].roles == []
class TestResourcePermissions: