From 507c948e213e3d3d4bcaf8818b4bbb3983db6409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=84riks=20K?= Date: Sat, 5 Apr 2025 13:10:49 +0300 Subject: [PATCH] Fix code style --- .../service/crud/user/methods.py | 7 +++---- {{ cookiecutter.project_slug }}/service/crud/utils.py | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/{{ cookiecutter.project_slug }}/service/crud/user/methods.py b/{{ cookiecutter.project_slug }}/service/crud/user/methods.py index 54c6a74..33681ce 100644 --- a/{{ cookiecutter.project_slug }}/service/crud/user/methods.py +++ b/{{ cookiecutter.project_slug }}/service/crud/user/methods.py @@ -1,9 +1,8 @@ +from service.api.dependencies import QueryParams from service.core.security import verify_password +from service.crud.user.models import UserPublic, UserRegister +from service.crud.utils import order_queryset from service.database.models import User -from ..utils import order_queryset - -from ...api.dependencies import QueryParams -from .models import UserPublic, UserRegister async def authenticate(*, username: str, password: str) -> User | None: diff --git a/{{ cookiecutter.project_slug }}/service/crud/utils.py b/{{ cookiecutter.project_slug }}/service/crud/utils.py index a9c57e8..fb87819 100644 --- a/{{ cookiecutter.project_slug }}/service/crud/utils.py +++ b/{{ cookiecutter.project_slug }}/service/crud/utils.py @@ -4,5 +4,7 @@ from service.constants.types import PaginationParams def order_queryset(qs: QuerySet, filters: PaginationParams, default: str) -> QuerySet: - ordering = [f for f in filters.order.split(",") if f.split("-")[-1] in qs.fields] + ordering = None + if filters.order: + ordering = [f for f in filters.order.split(",") if f.split("-")[-1] in qs.fields] return qs.order_by(*(ordering or (default, )))