gis-8825 fixes

nazargesyk · nazargesyk · commit 1ca0bb32b3dd · 2024-10-18T11:37:33.000+03:00
diff --git a/uncoder-core/app/translator/platforms/sentinel_one/custom_types/__init__.py b/uncoder-core/app/translator/platforms/sentinel_one/custom_types/__init__.py
diff --git a/uncoder-core/app/translator/platforms/sentinel_one/custom_types/values.py b/uncoder-core/app/translator/platforms/sentinel_one/custom_types/values.py
@@ -0,0 +1,5 @@
+from app.translator.core.custom_types.values import ValueType
+
+
+class SentinelOneValueType(ValueType):
+    double_escape_regex_value = "d_e_re_value"
diff --git a/uncoder-core/app/translator/platforms/sentinel_one/escape_manager.py b/uncoder-core/app/translator/platforms/sentinel_one/escape_manager.py
@@ -3,12 +3,14 @@
 from app.translator.core.custom_types.values import ValueType
 from app.translator.core.escape_manager import EscapeManager
 from app.translator.core.models.escape_details import EscapeDetails
+from app.translator.platforms.sentinel_one.custom_types.values import SentinelOneValueType
 
 
 class SentinelOnePowerQueryEscapeManager(EscapeManager):
     escape_map: ClassVar[dict[str, list[EscapeDetails]]] = {
         ValueType.value: [EscapeDetails(pattern=r"\\", escape_symbols=r"\\\\")],
-        ValueType.regex_value: [EscapeDetails(pattern=r"\\", escape_symbols=r"\\\\")],
+        ValueType.regex_value: [EscapeDetails(pattern=r"([$^*+()\[\]{}|.?\-\\])", escape_symbols=r"\\\1")],
+        SentinelOneValueType.double_escape_regex_value: [EscapeDetails(pattern=r"\\", escape_symbols=r"\\\\")],
     }
 
 
diff --git a/uncoder-core/app/translator/platforms/sentinel_one/renders/sentinel_one_power_query.py b/uncoder-core/app/translator/platforms/sentinel_one/renders/sentinel_one_power_query.py
@@ -33,19 +33,19 @@ def equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
         return f"{field} = {value}"
 
     def less_modifier(self, field: str, value: Union[int, str]) -> str:
-        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
+        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)
         return f"{field} < {value}"
 
     def less_or_equal_modifier(self, field: str, value: Union[int, str]) -> str:
-        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
+        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)
         return f"{field} <= {value}"
 
     def greater_modifier(self, field: str, value: Union[int, str]) -> str:
-        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
+        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)
         return f"{field} > {value}"
 
     def greater_or_equal_modifier(self, field: str, value: Union[int, str]) -> str:
-        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
+        value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)
         return f"{field} >= {value}"
 
     def not_equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
@@ -77,15 +77,11 @@ def startswith_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
     def regex_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
         if isinstance(value, list):
             values = self.list_token.join(
-                self.str_value_manager.escape_manager.escape(
-                    self._pre_process_value(field, v, value_type=ValueType.regex_value, wrap_str=True, wrap_int=True),
-                    ValueType.regex_value,
-                )
+                self._pre_process_value(field, v, value_type=ValueType.regex_value, wrap_str=True, wrap_int=True)
                 for v in value
             )
             return f"{field} matches ({values})"
         value = self._pre_process_value(field, value, value_type=ValueType.regex_value, wrap_str=True, wrap_int=True)
-        value = self.str_value_manager.escape_manager.escape(value, ValueType.regex_value)
         return f"{field} matches {value}"
 
     def is_none(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:  # noqa: ARG002
diff --git a/uncoder-core/app/translator/platforms/sentinel_one/str_value_manager.py b/uncoder-core/app/translator/platforms/sentinel_one/str_value_manager.py
@@ -16,8 +16,9 @@
 limitations under the License.
 -----------------------------------------------------------------
 """
-
-from app.translator.core.str_value_manager import StrValueManager
+from app.translator.core.custom_types.values import ValueType
+from app.translator.core.str_value_manager import BaseSpecSymbol, StrValue, StrValueManager
+from app.translator.platforms.sentinel_one.custom_types.values import SentinelOneValueType
 from app.translator.platforms.sentinel_one.escape_manager import (
     SentinelOnePowerQueryEscapeManager,
     sentinel_one_power_query_escape_manager,
@@ -27,5 +28,17 @@
 class SentinelOnePowerQueryStrValueManager(StrValueManager):
     escape_manager: SentinelOnePowerQueryEscapeManager = sentinel_one_power_query_escape_manager
 
+    def from_container_to_str(self, container: StrValue, value_type: str = ValueType.value) -> str:
+        result = ""
+        for el in container.split_value:
+            if isinstance(el, str):
+                result += self.escape_manager.escape(el, value_type)
+            elif isinstance(el, BaseSpecSymbol) and (pattern := self.container_spec_symbols_map.get(type(el))):
+                if value_type == ValueType.regex_value:
+                    pattern = self.escape_manager.escape(pattern, SentinelOneValueType.double_escape_regex_value)
+                result += pattern
+
+        return result
+
 
 sentinel_one_power_query_str_value_manager = SentinelOnePowerQueryStrValueManager()
