Merge pull request #43 from ImMin5/master

Fix public and private dashboard name check role
cloudforet-io · Jan 3, 2024 · 23d81df · 23d81df
2 parents a0c3040 + 5ff15fe
commit 23d81df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/spaceone/dashboard/model/private_dashboard_model.py b/src/spaceone/dashboard/model/private_dashboard_model.py
@@ -53,7 +53,11 @@ class PrivateDashboard(MongoModel):
     @classmethod
     def create(cls, data):
         dashboard_vos = cls.filter(
-            name=data["name"], user_id=data["user_id"], domain_id=data["domain_id"]
+            name=data["name"],
+            user_id=data["user_id"],
+            project_id=data["project_id"],
+            workspace_id=data["workspace_id"],
+            domain_id=data["domain_id"],
         )
 
         if dashboard_vos.count() > 0:

diff --git a/src/spaceone/dashboard/model/public_dashboard_model.py b/src/spaceone/dashboard/model/public_dashboard_model.py
@@ -58,7 +58,12 @@ class PublicDashboard(MongoModel):
 
     @classmethod
     def create(cls, data):
-        dashboard_vos = cls.filter(name=data["name"], domain_id=data["domain_id"])
+        dashboard_vos = cls.filter(
+            name=data["name"],
+            project_id=data["project_id"],
+            workspace_id=data["workspace_id"],
+            domain_id=data["domain_id"],
+        )
 
         if dashboard_vos.count() > 0:
             raise ERROR_NOT_UNIQUE(key="name", value=data["name"])