Skip to content

Commit

Permalink
fix: fixed another minor bug with the order_by method
Browse files Browse the repository at this point in the history
  • Loading branch information
creyD committed Apr 25, 2024
1 parent f24db62 commit 4c25d91
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions creyPY/fastapi/order_by.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
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


def order_by(order_by: str | SkipJsonSchema[None] = None) -> Callable[[Select], 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

0 comments on commit 4c25d91

Please sign in to comment.