feat: add unique user_id to workspace group although the user has wor…

…kspaces Signed-off-by: Youngjin Jo <[email protected]>
cloudforet-io · Sep 11, 2024 · b2b2b8f · b2b2b8f
1 parent a85168c
commit b2b2b8f
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/src/spaceone/identity/service/workspace_group_service.py b/src/spaceone/identity/service/workspace_group_service.py
@@ -64,6 +64,7 @@ def __init__(self, *args, **kwargs):
         self.user_mgr = UserManager()
         self.role_mgr = RoleManager()
         self.rb_mgr = RoleBindingManager()
+        self.rb_svc = RoleBindingService()
 
     @transaction(
         permission="identity:WorkspaceGroup.write", role_types=["DOMAIN_ADMIN"]
@@ -487,16 +488,17 @@ def get_workspace_ids(workspace_group_id: str, domain_id: str) -> List[str]:
 
         return workspace_ids
 
-    @staticmethod
     def add_users_to_workspace_group(
+        self,
         new_users_info_list: List[Dict[str, str]],
         role_map: Dict[str, str],
         workspace_group_workspace_ids: List[str],
         workspace_group_id: str,
         domain_id: str,
     ) -> List[Dict[str, str]]:
         new_users_in_workspace_group = []
-        rb_svc = RoleBindingService()
+        added_user_ids = set()
+
         if workspace_group_workspace_ids:
             for workspace_id in workspace_group_workspace_ids:
                 for new_user_info in new_users_info_list:
@@ -511,25 +513,33 @@ def add_users_to_workspace_group(
                         "workspace_group_id": workspace_group_id,
                         "workspace_id": workspace_id,
                     }
-                    new_user_rb_vo = rb_svc.create_role_binding(role_binding_params)
-                    new_users_in_workspace_group.append(
-                        {
-                            "user_id": new_user_rb_vo.user_id,
-                            "role_id": new_user_rb_vo.role_id,
-                            "role_type": new_user_rb_vo.role_type,
-                        }
+                    new_user_rb_vo = self.rb_svc.create_role_binding(
+                        role_binding_params
                     )
+
+                    # Prevent duplicate user_id in workspace group
+                    if new_user_rb_vo.user_id not in added_user_ids:
+                        new_users_in_workspace_group.append(
+                            {
+                                "user_id": new_user_rb_vo.user_id,
+                                "role_id": new_user_rb_vo.role_id,
+                                "role_type": new_user_rb_vo.role_type,
+                            }
+                        )
+                        added_user_ids.add(new_user_rb_vo.user_id)
         else:
             for new_user_info in new_users_info_list:
-                role_type = role_map[new_user_info["role_id"]]
+                if new_user_info["user_id"] not in added_user_ids:
+                    role_type = role_map[new_user_info["role_id"]]
 
-                new_users_in_workspace_group.append(
-                    {
-                        "user_id": new_user_info["user_id"],
-                        "role_id": new_user_info["role_id"],
-                        "role_type": role_type,
-                    }
-                )
+                    new_users_in_workspace_group.append(
+                        {
+                            "user_id": new_user_info["user_id"],
+                            "role_id": new_user_info["role_id"],
+                            "role_type": role_type,
+                        }
+                    )
+                    added_user_ids.add(new_user_info["user_id"])
 
         return new_users_in_workspace_group