feat: add change query filter for v_workspace_id

Author: ImMin5

src/spaceone/cost_analysis/manager/cost_manager.py

@@ -87,11 +87,11 @@ def delete_cost_with_datasource(self, domain_id: str, data_source_id: str) -> No
         history_vos.delete()
 
     def get_cost(
-        self,
-        cost_id: str,
-        domain_id: str,
-        workspace_id=None,
-        user_projects: list = None,
+            self,
+            cost_id: str,
+            domain_id: str,
+            workspace_id=None,
+            user_projects: list = None,
     ):
         conditions = {"cost_id": cost_id, "domain_id": domain_id}
 
@@ -108,21 +108,26 @@ def filter_costs(self, **conditions):
 
     def list_costs(self, query: dict, domain_id: str):
         query = self._change_filter_project_group_id(query, domain_id)
+        query = self._change_filter_v_workspace_id(query, domain_id)
         return self.cost_model.query(**query)
 
     def stat_costs(self, query: dict, domain_id: str):
         query = self._change_filter_project_group_id(query, domain_id)
+        query = self._change_filter_v_workspace_id(query, domain_id)
+
         return self.cost_model.stat(**query)
 
     def filter_monthly_costs(self, **conditions):
         return self.monthly_cost_model.filter(**conditions)
 
     def list_monthly_costs(self, query: dict, domain_id: str):
         query = self._change_filter_project_group_id(query, domain_id)
+        query = self._change_filter_v_workspace_id(query, domain_id)
         return self.monthly_cost_model.query(**query)
 
     def stat_monthly_costs(self, query: dict, domain_id: str):
         query = self._change_filter_project_group_id(query, domain_id)
+        query = self._change_filter_v_workspace_id(query, domain_id)
         return self.monthly_cost_model.stat(**query)
 
     def analyze_costs(self, query, domain_id, target="SECONDARY_PREFERRED"):
@@ -132,6 +137,7 @@ def analyze_costs(self, query, domain_id, target="SECONDARY_PREFERRED"):
         _LOGGER.debug(f"[analyze_costs] query: {query}")
 
         query = self._change_filter_project_group_id(query, domain_id)
+        query = self._change_filter_v_workspace_id(query, domain_id)
         return self.cost_model.analyze(**query)
 
     def analyze_monthly_costs(self, query, domain_id, target="SECONDARY_PREFERRED"):
@@ -141,6 +147,7 @@ def analyze_monthly_costs(self, query, domain_id, target="SECONDARY_PREFERRED"):
         _LOGGER.debug(f"[analyze_monthly_costs] query: {query}")
 
         query = self._change_filter_project_group_id(query, domain_id)
+        query = self._change_filter_v_workspace_id(query, domain_id)
         return self.monthly_cost_model.analyze(**query)
 
     def analyze_yearly_costs(self, query, domain_id, target="SECONDARY_PREFERRED"):
@@ -150,14 +157,15 @@ def analyze_yearly_costs(self, query, domain_id, target="SECONDARY_PREFERRED"):
         _LOGGER.debug(f"[analyze_yearly_costs] query: {query}")
 
         query = self._change_filter_project_group_id(query, domain_id)
+        query = self._change_filter_v_workspace_id(query, domain_id)
         return self.monthly_cost_model.analyze(**query)
 
     @cache.cacheable(
         key="cost-analysis:stat-costs:monthly:{domain_id}:{data_source_id}:{query_hash}",
         expire=3600 * 24,
     )
     def stat_monthly_costs_with_cache(
-        self, query, query_hash, domain_id, data_source_id
+            self, query, query_hash, domain_id, data_source_id
     ):
         return self.stat_monthly_costs(query, domain_id)
 
@@ -166,7 +174,7 @@ def stat_monthly_costs_with_cache(
         expire=3600 * 24,
     )
     def analyze_costs_with_cache(
-        self, query, query_hash, domain_id, data_source_id, target="SECONDARY_PREFERRED"
+            self, query, query_hash, domain_id, data_source_id, target="SECONDARY_PREFERRED"
     ):
         return self.analyze_costs(query, domain_id, target)
 
@@ -175,7 +183,7 @@ def analyze_costs_with_cache(
         expire=3600 * 24,
     )
     def analyze_monthly_costs_with_cache(
-        self, query, query_hash, domain_id, data_source_id, target="SECONDARY_PREFERRED"
+            self, query, query_hash, domain_id, data_source_id, target="SECONDARY_PREFERRED"
     ):
         return self.analyze_monthly_costs(query, domain_id, target)
 
@@ -184,12 +192,12 @@ def analyze_monthly_costs_with_cache(
         expire=3600 * 24,
     )
     def analyze_yearly_costs_with_cache(
-        self, query, query_hash, domain_id, data_source_id, target="SECONDARY_PREFERRED"
+            self, query, query_hash, domain_id, data_source_id, target="SECONDARY_PREFERRED"
     ):
         return self.analyze_yearly_costs(query, domain_id, target)
 
     def analyze_costs_by_granularity(
-        self, query: dict, domain_id: dict, data_source_id: dict
+            self, query: dict, domain_id: dict, data_source_id: dict
     ):
         self._check_date_range(query)
         granularity = query["granularity"]
@@ -418,3 +426,49 @@ def _change_filter_project_group_id(self, query: dict, domain_id: str) -> dict:
 
         query["filter"] = change_filter
         return query
+
+    def _change_filter_v_workspace_id(self, query: dict, domain_id: str) -> dict:
+        change_filter = []
+        workspace_ids = []
+        data_source_id = self._get_data_source_id_from_filter(query)
+
+        for condition in query.get("filter", []):
+            key = condition.get("k", condition.get("key"))
+            value = condition.get("v", condition.get("value"))
+            operator = condition.get("o", condition.get("operator"))
+
+            if key == "workspace_id":
+                query = {
+                    "filter": [
+                        {"k": "domain_id", "v": domain_id, "o": "eq"},
+                        {"k": "data_source_id", "v": data_source_id, "o": "eq"},
+                        {"k": key, "v": value, "o": operator},
+                    ]
+                }
+                (
+                    ds_accounts_vos,
+                    total_count,
+                ) = self.data_source_account_mgr.list_data_source_accounts(query)
+
+                if total_count > 0:
+                    for ds_accounts_vo in ds_accounts_vos:
+                        if ds_accounts_vo.workspace_id:
+                            workspace_ids.append(ds_accounts_vo.workspace_id)
+
+                change_filter.append(
+                    {"k": "workspace_id", "v": workspace_ids, "o": "in"}
+                )
+
+            else:
+                change_filter.append(condition)
+            query["filter"] = change_filter
+        return query
+
+    @staticmethod
+    def _get_data_source_id_from_filter(query: dict) -> str:
+        for condition in query.get("filter", []):
+            key = condition.get("k", condition.get("key"))
+            value = condition.get("v", condition.get("value"))
+
+            if key == "data_source_id":
+                return value

src/spaceone/cost_analysis/manager/data_source_account_manager.py

@@ -94,10 +94,6 @@ def connect_cost_data(
 
         use_account_routing = plugin_info_metadata.get("use_account_routing", False)
 
-        _LOGGER.debug(
-            f"[connect_cost_data] data_source_id: {data_source_id}, domain_id: {domain_id}, use_account_routing: {use_account_routing}, plugin_info_metadata: {plugin_info_metadata}"
-        )
-
         ds_account_vo = None
         if use_account_routing:
             account_connect_polices: list = plugin_info_metadata.get(
@@ -112,10 +108,6 @@ def connect_cost_data(
                     target_value = utils.get_dict_value(cost_data, source)
                     operator = policy.get("operator")
 
-                    _LOGGER.debug(
-                        f"[connect_cost_data] source: {source}, target_key: {target_key}, target_value: {target_value}"
-                    )
-
                     if target_value:
                         ds_account_vo = self._get_data_source_account_vo(
                             target_key,
@@ -124,11 +116,10 @@ def connect_cost_data(
                             domain_id,
                             operator,
                         )
-                        _LOGGER.debug(
-                            f"[connect_cost_data] ds_account_vo: {ds_account_vo.to_dict()}"
-                        )
-                        if ds_account_vo:
-                            cost_data["account_id"] = ds_account_vo.account_id
+
+        if ds_account_vo:
+            cost_data["account_id"] = ds_account_vo.account_id
+            cost_data["workspace_id"] = ds_account_vo.v_workspace_id
 
         return cost_data, ds_account_vo
 

src/spaceone/cost_analysis/manager/data_source_rule_manager.py

@@ -155,8 +155,9 @@ def _change_cost_data_with_actions(
                         target_key, target_value, domain_id, workspace_id
                     )
                     if project_info:
-                        cost_data["workspace_id"] = project_info.get("workspace_id")
                         cost_data["project_id"] = project_info["project_id"]
+                    if not data_source_account_vo:
+                        cost_data["workspace_id"] = project_info.get("workspace_id")
 
             elif action == "match_service_account" and value:
                 source = value["source"]
@@ -170,10 +171,11 @@ def _change_cost_data_with_actions(
                         cost_data["service_account_id"] = service_account_info[
                             "service_account_id"
                         ]
+                        cost_data["project_id"] = service_account_info.get("project_id")
+                    if not data_source_account_vo:
                         cost_data["workspace_id"] = service_account_info.get(
                             "workspace_id"
                         )
-                        cost_data["project_id"] = service_account_info.get("project_id")
 
             if action == "add_additional_info" and value:
                 cost_data["additional_info"] = cost_data.get("additional_info", {})