Merge pull request #104 from stat-kwon/master

Modify logic of options expressions in data_source_manager
cloudforet-io · Nov 5, 2024 · c6d3c12 · c6d3c12
2 parents 8f6dc2f + f328319
commit c6d3c12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 40 deletions.
diff --git a/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py b/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py
@@ -330,46 +330,6 @@ def _make_query(
         end: str,
         vars: dict = None,
     ):
-
-        if vars:
-            self.filter = self.filter or []
-            for key, value in vars.items():
-                if key in ["workspace_id", "project_id", "service_account_id"]:
-                    if isinstance(value, list):
-                        self.filter.append(
-                            {"key": key, "value": value, "operator": "in"}
-                        )
-                    else:
-                        self.filter.append(
-                            {"key": key, "value": value, "operator": "eq"}
-                        )
-                elif key == "region_code":
-                    if isinstance(value, list):
-                        if self.source_type == "COST":
-                            self.filter.append(
-                                {"key": "region_code", "value": value, "operator": "in"}
-                            )
-                        else:
-                            self.filter.append(
-                                {
-                                    "key": "labels.Region",
-                                    "value": value,
-                                    "operator": "in",
-                                }
-                            )
-                    else:
-                        if self.source_type == "COST":
-                            self.filter.append(
-                                {"key": "region_code", "value": value, "operator": "eq"}
-                            )
-                        else:
-                            self.filter.append(
-                                {
-                                    "key": "labels.Region",
-                                    "value": value,
-                                    "operator": "eq",
-                                }
-                            )
         if self.filter:
             for filter_info in self.filter:
                 query_value = filter_info.get("v") or filter_info.get("value")

diff --git a/src/spaceone/dashboard/service/public_data_table_service.py b/src/spaceone/dashboard/service/public_data_table_service.py
@@ -1,4 +1,5 @@
 import logging
+import copy
 from typing import Union
 
 from spaceone.core.service import *
@@ -250,6 +251,8 @@ def update(
         vars = params_dict.get("vars")
 
         if options := params_dict.get("options"):
+            raw_filter = copy.deepcopy(options.get("filter"))
+
             if pub_data_table_vo.data_type == "ADDED":
                 ds_mgr = DataSourceManager(
                     "PUBLIC",
@@ -308,6 +311,9 @@ def update(
                     operator: operator_options,
                 }
 
+            if raw_filter:
+                params_dict["options"]["filter"] = raw_filter
+
         pub_data_table_vo = self.pub_data_table_mgr.update_public_data_table_by_vo(
             params_dict, pub_data_table_vo
         )