Compare commits

...

4 Commits
1.2.1 ... 1.2.4

4 changed files with 46 additions and 22 deletions

View File

@@ -2,6 +2,18 @@
All notable changes to this project will be documented in this file.
## 1.2.4
- Enabled newer versions for all dependencies
## 1.2.3
- Added option to specify lookup_column for get_object_or_404
## 1.2.2
- Added order_by method
## 1.1.0
- Added headers to testing

View File

@@ -10,8 +10,10 @@ from .models.base import Base
T = TypeVar("T", bound=Base)
def get_object_or_404(db_class: Type[T], id: UUID | str, db: Session, expunge: bool = False) -> T:
obj = db.query(db_class).filter(db_class.id == id).one_or_none()
def get_object_or_404(
db_class: Type[T], id: UUID | str, db: Session, expunge: bool = False, lookup_column: str = "id"
) -> T:
obj = db.query(db_class).filter(getattr(db_class, lookup_column) == id).one_or_none()
if obj is None:
raise HTTPException(status_code=404, detail="The object does not exist.")
if expunge:

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

View File

@@ -1,23 +1,23 @@
annotated-types==0.6.0 # Pydantic
pydantic==2.6.4 # Pydantic
pydantic-core==2.16.3 # Pydantic
typing-extensions==4.10.0 # Pydantic
annotated-types>=0.6.0 # Pydantic
pydantic>=2.6.4 # Pydantic
pydantic-core>=2.16.3 # Pydantic
typing-extensions>=4.10.0 # Pydantic
anyio==4.3.0 # FastAPI
fastapi==0.110.1 # FastAPI
idna==3.6 # FastAPI
sniffio==1.3.1 # FastAPI
starlette==0.37.2 # FastAPI
anyio>=4.3.0 # FastAPI
fastapi>=0.110.1 # FastAPI
idna>=3.6 # FastAPI
sniffio>=1.3.1 # FastAPI
starlette>=0.37.2 # FastAPI
fastapi-pagination==0.12.21 # Pagination
sqlalchemy==2.0.29 # SQLAlchemy
fastapi-pagination>=0.12.21 # Pagination
sqlalchemy>=2.0.29 # SQLAlchemy
python-dotenv==1.0.1 # Environment variables
python-dotenv>=1.0.1 # Environment variables
psycopg==3.1.18 # PostgreSQL
psycopg-binary==3.1.18 # PostgreSQL
psycopg-pool==3.2.1 # PostgreSQL
psycopg>=3.1.18 # PostgreSQL
psycopg-binary>=3.1.18 # PostgreSQL
psycopg-pool>=3.2.1 # PostgreSQL
h11==0.14.0 # Testing
httpcore==1.0.5 # Testing
httpx==0.27.0 # Testing
h11>=0.14.0 # Testing
httpcore>=1.0.5 # Testing
httpx>=0.27.0 # Testing