|
19 | 19 | from typing import Union |
20 | 20 |
|
21 | 21 | from app.translator.const import DEFAULT_VALUE_TYPE |
| 22 | +from app.translator.core.custom_types.values import ValueType |
22 | 23 | from app.translator.core.exceptions.render import UnsupportedRenderMethod |
23 | 24 | from app.translator.core.models.platform_details import PlatformDetails |
24 | 25 | from app.translator.core.render import BaseQueryFieldValue, PlatformQueryRender |
@@ -59,30 +60,30 @@ def greater_or_equal_modifier(self, field: str, value: Union[int, str]) -> str: |
59 | 60 | def not_equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: |
60 | 61 | if isinstance(value, list): |
61 | 62 | return f"({self.or_token.join([self.not_equal_modifier(field=field, value=v) for v in value])})" |
62 | | - return f'{field} != "{value}"' |
| 63 | + return f'{field} != "{self.apply_value(value)}"' |
63 | 64 |
|
64 | 65 | def contains_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: |
65 | 66 | if isinstance(value, list): |
66 | 67 | return f"({self.or_token.join(self.contains_modifier(field=field, value=v) for v in value)})" |
67 | | - return f'{field} contains "{value}"' |
| 68 | + return f'{field} contains "{self.apply_value(value)}"' |
68 | 69 |
|
69 | 70 | def endswith_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: |
70 | 71 | if isinstance(value, list): |
71 | 72 | return ( |
72 | | - f"({self.or_token.join(self.endswith_modifier(field=field, value=self.apply_value(v)) for v in value)})" |
| 73 | + f"({self.or_token.join(self.endswith_modifier(field=field, value=v) for v in value)})" |
73 | 74 | ) |
74 | | - return f'{field} ~= ".*{self.apply_value(value)}"' |
| 75 | + return f'{field} ~= ".*{self.apply_value(value, value_type=ValueType.regex_value)}"' |
75 | 76 |
|
76 | 77 | def startswith_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: |
77 | 78 | if isinstance(value, list): |
78 | | - clause = self.or_token.join(self.startswith_modifier(field=field, value=self.apply_value(v)) for v in value) |
| 79 | + clause = self.or_token.join(self.startswith_modifier(field=field, value=v) for v in value) |
79 | 80 | return f"({clause})" |
80 | | - return f'{field} ~= "{self.apply_value(value)}.*"' |
| 81 | + return f'{field} ~= "{self.apply_value(value, value_type=ValueType.regex_value)}.*"' |
81 | 82 |
|
82 | 83 | def regex_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: |
83 | 84 | if isinstance(value, list): |
84 | | - return f"({self.or_token.join(self.regex_modifier(field=field, value=self.apply_value(v)) for v in value)})" |
85 | | - return f'{field} ~= "{self.apply_value(value)}"' |
| 85 | + return f"({self.or_token.join(self.regex_modifier(field=field, value=v) for v in value)})" |
| 86 | + return f'{field} ~= "{self.apply_value(value, value_type=ValueType.regex_value)}"' |
86 | 87 |
|
87 | 88 | def is_none(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: |
88 | 89 | if isinstance(value, list): |
|
0 commit comments