Merge pull request #24 from whdalsrnt/master

fix: fix permission bug

Author: Jongmin Kim

src/spaceone/statistics/manager/resource_manager.py

@@ -123,7 +123,7 @@ def _sort(options, base_df):
 
         return base_df
 
-    def _concat(self, options, base_df, domain_id):
+    def _concat(self, options, base_df, domain_id=None):
         concat_df = self._query(options, operator="join", domain_id=domain_id)
 
         try:
@@ -153,7 +153,7 @@ def _generate_empty_data(query):
 
         return pd.DataFrame(empty_data)
 
-    def _join(self, options, base_df, domain_id):
+    def _join(self, options, base_df, domain_id=None):
         if "type" in options and options["type"] not in _JOIN_TYPE_MAP:
             raise ERROR_INVALID_PARAMETER_TYPE(
                 key="aggregate.join.type", type=list(_JOIN_TYPE_MAP.keys())

src/spaceone/statistics/service/resource_service.py

@@ -31,6 +31,7 @@ def stat(self, params):
                 'total_count': 'int'
             }
         """
+
         aggregate = params.get("aggregate", [])
         page = params.get("page", {})
 

src/spaceone/statistics/service/schedule_service.py

@@ -49,7 +49,7 @@ def add(self, params: dict) -> Schedule:
         schedule = params["schedule"]
 
         self._check_schedule(schedule)
-        self._verify_query_option(options)
+        self._verify_query_option(options, domain_id)
         return self.schedule_mgr.add_schedule(params)
 
     @transaction(
@@ -255,8 +255,8 @@ def _check_schedule(schedule: dict) -> None:
         if schedule and len(schedule) > 1:
             raise ERROR_SCHEDULE_OPTION()
 
-    def _verify_query_option(self, options: dict) -> None:
+    def _verify_query_option(self, options: dict, domain_id: str) -> None:
         aggregate = options.get("aggregate", [])
         page = options.get("page", {})
 
-        self.resource_mgr.stat(aggregate, page)
+        self.resource_mgr.stat(aggregate, page, domain_id)