Merge pull request #321 from ImMin5/master

Update query filters to use schedule.state and include workspace…

Author: ImMin5

src/spaceone/cost_analysis/manager/cost_manager.py

@@ -633,7 +633,12 @@ def _add_hint_to_query(query: dict) -> dict:
 
             if key == "workspace_id" and operator in ["eq", "not", "in", "not_in"]:
                 workspace_id_exist = True
-            elif key in ["project_id", "user_projects"] and operator in ["eq", "not", "in", "not_in"]:
+            elif key in ["project_id", "user_projects"] and operator in [
+                "eq",
+                "not",
+                "in",
+                "not_in",
+            ]:
                 project_id_exist = True
 
         if workspace_id_exist and project_id_exist:

src/spaceone/cost_analysis/manager/data_source_rule_manager.py

@@ -246,7 +246,7 @@ def _get_project(
 
         query = {
             "filter": [{"k": target_key, "v": target_value, "o": "eq"}],
-            "only": ["project_id"],
+            "only": ["project_id", "workspace_id"],
         }
         if workspace_id:
             query["filter"].append({"k": "workspace_id", "v": workspace_id, "o": "eq"})
@@ -260,9 +260,9 @@ def _get_project(
         if total_count > 0:
             project_info = results[0]
 
-        self._project_info[
-            f"project:{domain_id}:{target_key}:{target_value}"
-        ] = project_info
+        self._project_info[f"project:{domain_id}:{target_key}:{target_value}"] = (
+            project_info
+        )
         return project_info
 
     def _get_workspace(
@@ -287,9 +287,9 @@ def _get_workspace(
         if total_count > 0:
             workspace_info = results[0]
 
-        self._workspace_info[
-            f"workspace:{domain_id}:{target_key}:{target_value}"
-        ] = workspace_info
+        self._workspace_info[f"workspace:{domain_id}:{target_key}:{target_value}"] = (
+            workspace_info
+        )
         return workspace_info
 
     def _change_cost_data_by_rule(

src/spaceone/cost_analysis/service/cost_report_data_service.py

@@ -226,25 +226,25 @@ def _aggregate_monthly_cost_report_data(
                 aggregated_cost_report_data.get("data_source_id")
             )
 
-            aggregated_cost_report_data[
-                "cost"
-            ] = CostReportManager.get_exchange_currency(
-                ag_cost, ag_cost_report_currency, self.currency_map
+            aggregated_cost_report_data["cost"] = (
+                CostReportManager.get_exchange_currency(
+                    ag_cost, ag_cost_report_currency, self.currency_map
+                )
             )
             aggregated_cost_report_data["currency"] = currency
             aggregated_cost_report_data["issue_date"] = issue_date
             aggregated_cost_report_data["report_month"] = report_month
-            aggregated_cost_report_data[
-                "report_year"
-            ] = aggregated_cost_report_data.pop("billed_year")
+            aggregated_cost_report_data["report_year"] = (
+                aggregated_cost_report_data.pop("billed_year")
+            )
             aggregated_cost_report_data["workspace_name"] = workspace_name
             aggregated_cost_report_data["project_name"] = project_name_map.get(
                 aggregated_cost_report_data["project_id"], "Unknown"
             )
-            aggregated_cost_report_data[
-                "service_account_name"
-            ] = service_account_name_map.get(
-                aggregated_cost_report_data["service_account_id"], "Unknown"
+            aggregated_cost_report_data["service_account_name"] = (
+                service_account_name_map.get(
+                    aggregated_cost_report_data["service_account_id"], "Unknown"
+                )
             )
 
             aggregated_cost_report_data["cost_report_config_id"] = cost_report_config_id
@@ -298,9 +298,9 @@ def _get_service_account_name_map(self, workspace_id: str, domain_id: str) -> di
             domain_id,
         )
         for service_account in service_accounts.get("results", []):
-            service_account_name_map[
-                service_account["service_account_id"]
-            ] = service_account["name"]
+            service_account_name_map[service_account["service_account_id"]] = (
+                service_account["name"]
+            )
         return service_account_name_map
 
     @staticmethod
@@ -323,16 +323,17 @@ def _get_data_source_currency_map(
             )
 
         if data_source_state := data_source_filter.get("state", "ENABLED"):
-            query["filter"].append({"k": "state", "v": data_source_state, "o": "eq"})
-
+            query["filter"].append(
+                {"k": "schedule.state", "v": data_source_state, "o": "eq"}
+            )
         _LOGGER.debug(f"[get_data_source_currency_map] query: {query}")
 
         data_source_vos, total_count = data_source_mgr.list_data_sources(query)
         data_source_ids = []
         for data_source_vo in data_source_vos:
-            data_source_currency_map[
-                data_source_vo.data_source_id
-            ] = data_source_vo.plugin_info["metadata"]["currency"]
+            data_source_currency_map[data_source_vo.data_source_id] = (
+                data_source_vo.plugin_info["metadata"]["currency"]
+            )
             data_source_ids.append(data_source_vo.data_source_id)
 
         return data_source_currency_map, data_source_ids

src/spaceone/cost_analysis/service/cost_report_serivce.py

@@ -687,7 +687,9 @@ def _get_data_source_currency_map(
             )
 
         if data_source_state := data_source_filter.get("state", "ENABLED"):
-            query["filter"].append({"k": "state", "v": data_source_state, "o": "eq"})
+            query["filter"].append(
+                {"k": "schedule.state", "v": data_source_state, "o": "eq"}
+            )
 
         _LOGGER.debug(f"[get_data_source_currency_map] query: {query}")