Merge pull request #118 from ImMin5/master

Allow to change parent_group to be root
cloudforet-io · Dec 11, 2023 · a492cd4 · a492cd4
2 parents 7d930a0 + 83f1d61
commit a492cd4
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/src/spaceone/identity/service/project_group_service.py b/src/spaceone/identity/service/project_group_service.py
@@ -95,25 +95,26 @@ def change_parent_group(
                 ProjectGroupResponse:
         """
 
-        # Check parent project group is
-        self.project_group_mgr.get_project_group(
-            params.parent_group_id, params.workspace_id, params.domain_id
-        )
-
         project_group_vo = self.project_group_mgr.get_project_group(
             params.project_group_id, params.workspace_id, params.domain_id
         )
 
-        # Check parent project group is not sub project group
-        project_group_vos = self.project_group_mgr.filter_project_groups(
-            workspace_id=params.workspace_id, domain_id=params.domain_id
-        )
+        # Check parent project group is
+        if params.parent_group_id:
+            self.project_group_mgr.get_project_group(
+                params.parent_group_id, params.workspace_id, params.domain_id
+            )
 
-        self._check_is_sub_project_group(
-            params.parent_group_id,
-            project_group_vo.project_group_id,
-            project_group_vos,
-        )
+            # Check parent project group is not sub project group
+            project_group_vos = self.project_group_mgr.filter_project_groups(
+                workspace_id=params.workspace_id, domain_id=params.domain_id
+            )
+
+            self._check_is_sub_project_group(
+                params.parent_group_id,
+                project_group_vo.project_group_id,
+                project_group_vos,
+            )
 
         project_group_vo = self.project_group_mgr.update_project_group_by_vo(
             params.dict(), project_group_vo