fixes

alexvolha · alexvolha · commit 0b092b4e8a1d · 2024-07-08T16:12:14.000+03:00
diff --git a/uncoder-core/app/translator/core/models/query_tokens/keyword.py b/uncoder-core/app/translator/core/models/query_tokens/keyword.py
@@ -2,22 +2,16 @@
 
 from app.translator.core.custom_types.tokens import OperatorType
 from app.translator.core.models.query_tokens.identifier import Identifier
+from app.translator.core.models.query_tokens.value import Value
 
 
-class Keyword:
+class Keyword(Value):
     def __init__(self, value: Union[str, list[str]]):
+        super().__init__(value)
         self.operator: Identifier = Identifier(token_type=OperatorType.KEYWORD)
         self.name = "keyword"
-        self.values = []
-        self.__add_value(value=value)
 
-    @property
-    def value(self) -> Union[str, list[str]]:
-        if isinstance(self.values, list) and len(self.values) == 1:
-            return self.values[0]
-        return self.values
-
-    def __add_value(self, value: Union[str, list[str]]) -> None:
+    def _add_value(self, value: Union[str, list[str]]) -> None:
         if value and isinstance(value, (list, tuple)):
             self.values.extend(value)
         elif value and isinstance(value, str):
diff --git a/uncoder-core/app/translator/core/models/query_tokens/value.py b/uncoder-core/app/translator/core/models/query_tokens/value.py
@@ -7,7 +7,7 @@ class Value:
     def __init__(self, value: Union[bool, int, str, StrValue, list, tuple], cast_to_int: bool = False):
         self.values = []
         self.__cast_to_int = cast_to_int
-        self.__add_value(value)
+        self._add_value(value)
 
     @property
     def value(self) -> Union[bool, int, str, StrValue, list[Union[int, str, StrValue]]]:
@@ -18,12 +18,12 @@ def value(self) -> Union[bool, int, str, StrValue, list[Union[int, str, StrValue
     @value.setter
     def value(self, new_value: Union[bool, int, str, StrValue, list[Union[int, str, StrValue]]]) -> None:
         self.values = []
-        self.__add_value(new_value)
+        self._add_value(new_value)
 
-    def __add_value(self, value: Optional[Union[bool, int, str, StrValue, list, tuple]]) -> None:
+    def _add_value(self, value: Optional[Union[bool, int, str, StrValue, list, tuple]]) -> None:
         if value and isinstance(value, (list, tuple)):
             for v in value:
-                self.__add_value(v)
+                self._add_value(v)
         elif value and isinstance(value, str) and value.isnumeric() and self.__cast_to_int:
             self.values.append(int(value))
         elif value is not None and isinstance(value, (bool, int, str)):
