Migrating to fastapi-pagination

This commit is contained in:
2025-03-17 17:46:04 +01:00
parent 3a14528402
commit ff78f9da54
3 changed files with 5 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
FROM python:3.10 FROM python:3.13
RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0 \ RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View File

@@ -3,8 +3,8 @@ from beanie.odm.operators.find.comparison import In
from beanie.operators import And, RegEx, Eq from beanie.operators import And, RegEx, Eq
from fastapi import APIRouter, HTTPException, Depends from fastapi import APIRouter, HTTPException, Depends
from fastapi_paginate import Page, Params, add_pagination from fastapi_pagination import Page, Params, add_pagination
from fastapi_paginate.ext.motor import paginate from fastapi_pagination.ext.beanie import paginate
from ..user.manager import get_current_user, get_current_superuser from ..user.manager import get_current_user, get_current_superuser
@@ -79,8 +79,7 @@ def get_crud_router(model, model_create, model_read, model_update):
sort = parse_sort(sort_by) sort = parse_sort(sort_by)
query = parse_query(query, model_read) query = parse_query(query, model_read)
collection = model.get_motor_collection() items = paginate(model.find(query), Params(**{'size': size, 'page': page}))
items = paginate(collection, query, Params(**{'size': size, 'page': page}), sort=sort)
return await items return await items
@router.put("/{id}", response_description="{} record updated".format(model.__name__)) @router.put("/{id}", response_description="{} record updated".format(model.__name__))

View File

@@ -1,8 +1,7 @@
fastapi fastapi
fastapi_users fastapi_users
fastapi_users_db_beanie fastapi_users_db_beanie
motor fastapi-pagination
fastapi-paginate
uvicorn uvicorn
jinja2 jinja2
weasyprint weasyprint