Merge pull request #339 from yjinjo/master

Rollback role_binding_info to the dictionary in the workspace user

src/spaceone/identity/manager/workspace_user_manager.py

@@ -70,7 +70,7 @@ def get_workspace_user(
 
         user_vo = self.user_mgr.get_user(user_id, domain_id)
         user_info = user_vo.to_dict()
-        user_info["role_bindings_info"] = user_rb_map[user_id]
+        user_info["role_binding_info"] = user_rb_map[user_id]
 
         return user_info
 
@@ -90,7 +90,7 @@ def list_workspace_users(
             user_info = user_vo.to_dict()
 
             if user_rb_map:
-                user_info["role_bindings_info"] = user_rb_map[user_vo.user_id]
+                user_info["role_binding_info"] = user_rb_map[user_vo.user_id]
 
             users_info.append(user_info)
 
@@ -127,9 +127,6 @@ def _get_role_binding_map_in_workspace(
 
         for rb_vo in rb_vos:
             user_ids.append(rb_vo.user_id)
-            if user_rb_map.get(rb_vo.user_id):
-                user_rb_map[rb_vo.user_id].append(rb_vo.to_dict())
-            else:
-                user_rb_map[rb_vo.user_id] = [rb_vo.to_dict()]
+            user_rb_map[rb_vo.user_id] = rb_vo.to_dict()
 
         return user_ids, user_rb_map

src/spaceone/identity/model/workspace_user/response.py

@@ -28,7 +28,7 @@ class WorkspaceUserResponse(BaseModel):
     language: Union[str, None] = None
     timezone: Union[str, None] = None
     tags: Union[dict, None] = None
-    role_bindings_info: Union[List[RoleBindingResponse], None] = None
+    role_binding_info: Union[RoleBindingResponse, None] = None
     domain_id: Union[str, None] = None
     created_at: Union[datetime, None] = None
     last_accessed_at: Union[datetime, None] = None