fix: fixed another minor bug with the order_by method

This commit is contained in:
2024-04-25 19:43:12 +02:00
parent f24db62781
commit 4c25d91e18
2 changed files with 16 additions and 2 deletions

View File

@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
## 1.2.X
- Added order_by method
## 1.1.0
- Added headers to testing

View File

@@ -1,7 +1,8 @@
from typing import Callable
from pydantic.json_schema import SkipJsonSchema
from sqlalchemy import asc, desc
from sqlalchemy import String, asc, cast, desc
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.sql.selectable import Select
@@ -9,7 +10,16 @@ def order_by(order_by: str | SkipJsonSchema[None] = None) -> Callable[[Select],
def _order_by(query: Select) -> Select:
if order_by:
direction = desc if order_by.startswith("-") else asc
query = query.order_by(direction(order_by.lstrip("-")))
column_name = order_by.lstrip("-")
# Get the column from the query
for column in query.inner_columns:
if column.key == column_name:
# If the column is a UUID, cast it to a string
if isinstance(column.type, UUID):
column = cast(column, String)
query = query.order_by(direction(column))
break
return query
return _order_by