jararaca 0.2.32__tar.gz → 0.2.33__tar.gz

{jararaca-0.2.32 → jararaca-0.2.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.2.32
+Version: 0.2.33
 Summary: A simple and fast API framework for Python
 Home-page: https://github.com/LuscasLeo/jararaca
 Author: Lucas S

{jararaca-0.2.32 → jararaca-0.2.33}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.2.32"
+version = "0.2.33"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"

{jararaca-0.2.32 → jararaca-0.2.33}/src/jararaca/persistence/sort_filter.py

@@ -138,14 +138,29 @@ class FilterRuleApplier:
                 case _:
                     raise ValueError(f"Unsupported bool operator: {filter.operator}")
         elif field_type is int:
-            __value = (
-                filter.value[0] if isinstance(filter.value, list) else filter.value
-            )
-            if not re.match(r"^-?\d+$", __value):
+
+            if isinstance(filter.value, list):
+                match filter.operator:
+                    case "isAnyOf":
+                        if not len(filter.value):
+                            return query
+
+                        number_values = [
+                            int(v) for v in filter.value if re.match(r"^-?\d+$", v)
+                        ]
+                        return query.filter(field.in_(number_values))
+                    case _:
+                        raise ValueError(
+                            f"Unsupported int operator: {filter.operator} for list"
+                        )
+
+            if not re.match(r"^-?\d+$", filter.value):
                 raise ValueError(
-                    f"Unsupported value type for int field: {type(__value)}"
+                    f"Invalid integer value: {filter.value} for field {field}"
                 )
-            number_value = int(__value)
+
+            number_value = int(filter.value)
+
             match filter.operator:
                 case "=":
                     return query.filter(field == number_value)
@@ -163,18 +178,10 @@ class FilterRuleApplier:
                     return query.filter(field == None)  # noqa
                 case "isNotEmpty":
                     return query.filter(field != None)  # noqa
-                case "isAnyOf":
-                    if not isinstance(filter.value, list):
-                        raise ValueError(
-                            f"Unsupported value type for isAnyOf operator: {type(filter.value)}"
-                        )
-
-                    number_values = [
-                        int(v) for v in filter.value if re.match(r"^-?\d+$", v)
-                    ]
-                    return query.filter(field.in_(number_values))
                 case _:
-                    raise ValueError(f"Unsupported int operator: {filter.operator}")
+                    raise ValueError(
+                        f"Unsupported int operator: {filter.operator} for single value"
+                    )
 
         raise ValueError(f"Unsupported field type: {field_type}")