fix: change value mapping logic

Signed-off-by: seolmin <[email protected]>
cloudforet-io · Jan 21, 2025 · 608b1b7 · 608b1b7
1 parent b555554
commit 608b1b7
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/spaceone/dashboard/manager/data_table_manager/data_transformation_manager.py b/src/spaceone/dashboard/manager/data_table_manager/data_transformation_manager.py
@@ -922,11 +922,24 @@ def apply_cases(self, filtered_df: pd.DataFrame) -> pd.DataFrame:
             match = case["match"].strip()
 
             if operator == "eq":
-                filtered_df.loc[filtered_df[key] == match, name] = value
+                if name not in filtered_df.columns:
+                    filtered_df.loc[filtered_df[key] == match, name] = value
+                else:
+                    filtered_df.loc[
+                        (filtered_df[key] == match) & (filtered_df[name].isna()), name
+                    ] = value
+
             elif operator == "regex":
-                filtered_df.loc[
-                    filtered_df[key].str.contains(match, na=False), name
-                ] = value
+                if name not in filtered_df.columns:
+                    filtered_df.loc[
+                        filtered_df[key].str.contains(match, na=False), name
+                    ] = value
+                else:
+                    filtered_df.loc[
+                        (filtered_df[key].str.contains(match, na=False))
+                        & (filtered_df[name].isna()),
+                        name,
+                    ] = value
 
         if else_value is not None:
             filtered_df.loc[filtered_df[name].isna(), name] = else_value