Skip to content

Commit 76e946f

Browse files
authored
Merge pull request #15 from just495/fix/sorting_attr
fix sorting
2 parents 31a4bc1 + f68fb28 commit 76e946f

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

examples/api_for_sqlalchemy/api/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ async def patch(cls, obj_id, data: UserPatchSchema, query_params: QueryStringMan
7676
class UserList:
7777
@classmethod
7878
async def get(cls, query_params: QueryStringManager, session: AsyncSession = Depends(Connector.get_session)) -> Union[Select, JSONAPIResultListSchema]:
79-
user_query = select(User).order_by(desc(User.id))
79+
user_query = select(User)
8080
dl = SqlalchemyEngine(query=user_query, schema=UserSchema, model=User, session=session)
8181
count, users_db = await dl.get_collection(qs=query_params)
8282
total_pages = count // query_params.pagination.size + (count % query_params.pagination.size and 1)

fastapi_rest_jsonapi/data_layers/sqlalchemy_engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def sort_query(self, query: Select, sort_info: list) -> Select:
324324
:return: the sorted query.
325325
"""
326326
if sort_info:
327-
sorts, joins = create_sorts(self.model, sort_info, self.resource if hasattr(self, "resource") else None)
327+
sorts, joins = create_sorts(self.model, sort_info, self.schema)
328328
for i_join in joins:
329329
query = query.join(*i_join)
330330
for i_sort in sorts:

fastapi_rest_jsonapi/methods.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,10 @@ async def wrapper(
247247
'`[{"name": "timestamp", "op": "ge", "val": "2020-07-16T11:35:33.383"},'
248248
'{"name": "timestamp", "op": "le", "val": "2020-07-21T11:35:33.383"}]`',
249249
),
250+
sort: Optional[str] = Query(
251+
None, alias='sort',
252+
description="[Sorting docs](https://flask-combo-jsonapi.readthedocs.io/en/latest/sorting.html)"
253+
),
250254
**kwargs,
251255
):
252256
query_params = QueryStringManager(request=request, schema=schema)

0 commit comments

Comments
 (0)