Skip to content

Commit

Permalink
Merge pull request #39 from stat-kwon/master
Browse files Browse the repository at this point in the history 
fix: remove user_id in PrivateDashboard service
  • Loading branch information
@stat-kwon
stat-kwon authored Dec 20, 2023
2 parents e13c8bd + c7cf451 commit c01542b
Showing 1 changed file with 18 additions and 28 deletions.
46 changes: 18 additions & 28 deletions src/spaceone/dashboard/service/private_dashboard_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
permission="dashboard:PrivateDashboard.write",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(["name", "workspace_id", "domain_id", "user_id"])
@check_required(["name", "workspace_id", "domain_id"])
def create(self, params: dict) -> PrivateDashboard:
"""Register private_dashboard
Expand All @@ -49,13 +49,14 @@ def create(self, params: dict) -> PrivateDashboard:
'tags': 'dict',
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
private_dashboard_vo (object)
"""

params["user_id"] = self.transaction.get_meta("authorization.user_id")

dashboard_vo = self.dashboard_mgr.create_private_dashboard(params)

version_keys = ["layouts", "variables", "variables_schema"]
Expand All @@ -70,7 +71,7 @@ def create(self, params: dict) -> PrivateDashboard:
permission="dashboard:PrivateDashboard.write",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(["private_dashboard_id", "workspace_id", "domain_id", "user_id"])
@check_required(["private_dashboard_id", "workspace_id", "domain_id"])
def update(self, params):
"""Update private_dashboard
Expand All @@ -86,7 +87,6 @@ def update(self, params):
'tags': 'dict',
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
Expand Down Expand Up @@ -122,7 +122,7 @@ def update(self, params):
permission="dashboard:PrivateDashboard.write",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(["private_dashboard_id", "workspace_id", "domain_id", "user_id"])
@check_required(["private_dashboard_id", "workspace_id", "domain_id"])
def delete(self, params):
"""Deregister private_dashboard
Expand All @@ -131,7 +131,6 @@ def delete(self, params):
'private_dashboard_id': 'str', # required
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
Expand All @@ -158,7 +157,7 @@ def delete(self, params):
permission="dashboard:PrivateDashboard.read",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(["private_dashboard_id", "workspace_id", "domain_id", "user_id"])
@check_required(["private_dashboard_id", "workspace_id", "domain_id"])
def get(self, params):
"""Get private_dashboard
Expand All @@ -167,7 +166,6 @@ def get(self, params):
'private_dashboard_id': 'str', # required
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
Expand All @@ -187,9 +185,7 @@ def get(self, params):
permission="dashboard:PrivateDashboard.write",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(
["private_dashboard_id", "version", "workspace_id", "domain_id", "user_id"]
)
@check_required(["private_dashboard_id", "version", "workspace_id", "domain_id"])
def delete_version(self, params):
"""delete version of domain dashboard
Expand Down Expand Up @@ -225,9 +221,7 @@ def delete_version(self, params):
permission="dashboard:PrivateDashboard.write",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(
["private_dashboard_id", "version", "workspace_id", "domain_id", "user_id"]
)
@check_required(["private_dashboard_id", "version", "workspace_id", "domain_id"])
def revert_version(self, params):
"""Revert version of domain dashboard
Expand All @@ -238,7 +232,6 @@ def revert_version(self, params):
'domain_id': 'str', # injected from auth (required)
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
Expand Down Expand Up @@ -271,9 +264,7 @@ def revert_version(self, params):
permission="dashboard:PrivateDashboard.read",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(
["private_dashboard_id", "version", "workspace_id", "domain_id", "user_id"]
)
@check_required(["private_dashboard_id", "version", "workspace_id", "domain_id"])
def get_version(self, params):
"""Get version of domain dashboard
Expand All @@ -283,7 +274,6 @@ def get_version(self, params):
'version': 'int', # required
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
Expand All @@ -300,7 +290,7 @@ def get_version(self, params):
permission="dashboard:PrivateDashboard.read",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(["private_dashboard_id", "workspace_id", "domain_id", "user_id"])
@check_required(["private_dashboard_id", "workspace_id", "domain_id"])
@append_query_filter(["private_dashboard_id", "version", "domain_id"])
@append_keyword_filter(["private_dashboard_id", "version"])
def list_versions(self, params):
Expand All @@ -313,7 +303,6 @@ def list_versions(self, params):
'version': 'int',
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
Expand All @@ -338,10 +327,8 @@ def list_versions(self, params):
permission="dashboard:PrivateDashboard.read",
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(["workspace_id", "domain_id", "user_id"])
@append_query_filter(
["private_dashboard_id", "name", "domain_id", "workspace_id", "user_id"]
)
@check_required(["workspace_id", "domain_id"])
@append_query_filter(["private_dashboard_id", "name", "domain_id", "workspace_id"])
@append_keyword_filter(["private_dashboard_id", "name"])
def list(self, params):
"""List private_dashboards
Expand All @@ -353,15 +340,17 @@ def list(self, params):
'name': 'str',
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
private_dashboard_vos (object)
total_count
"""

user_id = self.transaction.get_meta("authorization.user_id")

query = params.get("query", {})
query["filter"].append({"k": "user_id", "v": user_id, "o": "eq"})

return self.dashboard_mgr.list_private_dashboards(query)

Expand All @@ -370,7 +359,7 @@ def list(self, params):
role_types=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
)
@check_required(["query", "workspace_id", "domain_id"])
@append_query_filter(["domain_id", "workspace_id", "user_id"])
@append_query_filter(["domain_id", "workspace_id"])
@append_keyword_filter(["private_dashboard_id"])
def stat(self, params):
"""
Expand All @@ -379,15 +368,16 @@ def stat(self, params):
'query': 'dict (spaceone.api.core.v1.StatisticsQuery)'
'domain_id': 'str', # injected from auth (required)
'workspace_id': 'str', # injected from auth (required)
'user_id': 'str' # injected from auth (required)
}
Returns:
values (list) : 'list of statistics data'
"""
user_id = self.transaction.get_meta("authorization.user_id")

query = params.get("query", {})
query["filter"].append({"k": "user_id", "v": user_id, "o": "eq"})

return self.dashboard_mgr.stat_private_dashboards(query)

Expand Down

0 comments on commit c01542b

Please sign in to comment.