jararaca 0.2.22__tar.gz → 0.2.24__tar.gz

{jararaca-0.2.22 → jararaca-0.2.24}/PKG-INFO

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

{jararaca-0.2.22 → jararaca-0.2.24}/pyproject.toml

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

{jararaca-0.2.22 → jararaca-0.2.24}/src/jararaca/persistence/base.py

@@ -23,6 +23,8 @@ from sqlalchemy import DateTime, Result, Select, delete, func, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
+from jararaca.persistence.sort_filter import FilterModel, SortModel
+
 IDENTIFIABLE_SCHEMA_T = TypeVar("IDENTIFIABLE_SCHEMA_T")
 logger = logging.getLogger(__name__)
 
@@ -205,6 +207,8 @@ class CRUDOperations(Generic[IDENTIFIABLE_T]):
 class PaginatedFilter(BaseModel):
     page: Annotated[int, Field(gt=-1)] = 1
     page_size: int = 10
+    sort_models: list[SortModel] = []
+    filter_model: list[FilterModel] = []
 
 
 class QueryInjector(Protocol):

{jararaca-0.2.22 → jararaca-0.2.24}/src/jararaca/persistence/sort_filter.py

@@ -94,6 +94,12 @@ class SortFilterRunner:
                 case _:
                     raise ValueError(f"Unsupported string operator: {filter.operator}")
         elif field_type in [date, datetime]:
+            match filter.operator:
+                case "isEmpty":
+                    return query.filter(field == None)  # noqa
+                case "isNotEmpty":
+                    return query.filter(field != None)  # noqa
+
             __value = (
                 filter.value[0] if isinstance(filter.value, list) else filter.value
             )
@@ -114,10 +120,7 @@ class SortFilterRunner:
                     return query.filter(field < value)
                 case "onOrBefore":
                     return query.filter(field <= value)
-                case "isEmpty":
-                    return query.filter(field == None)  # noqa
-                case "isNotEmpty":
-                    return query.filter(field != None)  # noqa
+
                 case _:
                     raise ValueError(
                         f"Unsupported data/datetime operator: {filter.operator}"