|
19 | 19 | fromtypingimportUnion |
20 | 20 |
|
21 | 21 | fromapp.translator.constimportDEFAULT_VALUE_TYPE |
| 22 | +fromapp.translator.core.custom_types.valuesimportValueType |
22 | 23 | fromapp.translator.core.exceptions.renderimportUnsupportedRenderMethod |
23 | 24 | fromapp.translator.core.models.platform_detailsimportPlatformDetails |
24 | 25 | fromapp.translator.core.renderimportBaseQueryFieldValue,PlatformQueryRender |
@@ -59,30 +60,30 @@ def greater_or_equal_modifier(self, field: str, value: Union[int, str]) -> str: |
59 | 60 | defnot_equal_modifier(self,field:str,value:DEFAULT_VALUE_TYPE)->str: |
60 | 61 | ifisinstance(value,list): |
61 | 62 | returnf"({self.or_token.join([self.not_equal_modifier(field=field,value=v)forvinvalue])})" |
62 | | -returnf'{field} != "{value}"' |
| 63 | +returnf'{field} != "{self.apply_value(value)}"' |
63 | 64 |
|
64 | 65 | defcontains_modifier(self,field:str,value:DEFAULT_VALUE_TYPE)->str: |
65 | 66 | ifisinstance(value,list): |
66 | 67 | returnf"({self.or_token.join(self.contains_modifier(field=field,value=v)forvinvalue)})" |
67 | | -returnf'{field} contains "{value}"' |
| 68 | +returnf'{field} contains "{self.apply_value(value)}"' |
68 | 69 |
|
69 | 70 | defendswith_modifier(self,field:str,value:DEFAULT_VALUE_TYPE)->str: |
70 | 71 | ifisinstance(value,list): |
71 | 72 | return ( |
72 | | -f"({self.or_token.join(self.endswith_modifier(field=field,value=self.apply_value(v))forvinvalue)})" |
| 73 | +f"({self.or_token.join(self.endswith_modifier(field=field,value=v)forvinvalue)})" |
73 | 74 | ) |
74 | | -returnf'{field} ~= ".*{self.apply_value(value)}"' |
| 75 | +returnf'{field} ~= ".*{self.apply_value(value,value_type=ValueType.regex_value)}"' |
75 | 76 |
|
76 | 77 | defstartswith_modifier(self,field:str,value:DEFAULT_VALUE_TYPE)->str: |
77 | 78 | ifisinstance(value,list): |
78 | | -clause=self.or_token.join(self.startswith_modifier(field=field,value=self.apply_value(v))forvinvalue) |
| 79 | +clause=self.or_token.join(self.startswith_modifier(field=field,value=v)forvinvalue) |
79 | 80 | returnf"({clause})" |
80 | | -returnf'{field} ~= "{self.apply_value(value)}.*"' |
| 81 | +returnf'{field} ~= "{self.apply_value(value,value_type=ValueType.regex_value)}.*"' |
81 | 82 |
|
82 | 83 | defregex_modifier(self,field:str,value:DEFAULT_VALUE_TYPE)->str: |
83 | 84 | ifisinstance(value,list): |
84 | | -returnf"({self.or_token.join(self.regex_modifier(field=field,value=self.apply_value(v))forvinvalue)})" |
85 | | -returnf'{field} ~= "{self.apply_value(value)}"' |
| 85 | +returnf"({self.or_token.join(self.regex_modifier(field=field,value=v)forvinvalue)})" |
| 86 | +returnf'{field} ~= "{self.apply_value(value,value_type=ValueType.regex_value)}"' |
86 | 87 |
|
87 | 88 | defis_none(self,field:str,value:DEFAULT_VALUE_TYPE)->str: |
88 | 89 | ifisinstance(value,list): |
|