Исправление фильтров, добавление ссылки на главную в документации

library_service/routers/books.py

@@ -7,7 +7,7 @@ from sqlmodel import Session, select, col, func
 from library_service.auth import RequireAuth
 from library_service.settings import get_session
 from library_service.models.db import Author, AuthorBookLink, Book
-from library_service.models.dto import AuthorRead, BookCreate, BookList, BookRead, BookUpdate
+from library_service.models.dto import AuthorRead, BookCreate, BookList, BookRead, BookUpdate, GenreRead
 from library_service.models.dto.combined import (
     BookWithAuthorsAndGenres,
     BookFilteredList
@@ -17,6 +17,54 @@ from library_service.models.dto.combined import (
 router = APIRouter(prefix="/books", tags=["books"])
 
 
+@router.get(
+    "/filter",
+    response_model=BookFilteredList,
+    summary="Фильтрация книг",
+    description="Фильтрация списка книг по названию, авторам и жанрам с пагинацией"
+)
+def filter_books(
+    session: Session = Depends(get_session),
+    q: str | None = Query(None, min_length=3, max_length=50, description="Поиск"),
+    author_ids: List[int] | None = Query(None, description="Список ID авторов"),
+    genre_ids: List[int] | None = Query(None, description="Список ID жанров"),
+    page: int = Query(1, gt=0, description="Номер страницы"),
+    size: int = Query(20, gt=0, lt=101, description="Количество элементов на странице"),
+):
+    """Эндпоинт получения отфильтрованного списка книг"""
+    statement = select(Book).distinct()
+
+    if q:
+        statement = statement.where(
+            (col(Book.title).ilike(f"%{q}%")) | (col(Book.description).ilike(f"%{q}%"))
+        )
+
+    if author_ids:
+        statement = statement.join(AuthorBookLink).where(AuthorBookLink.author_id.in_(author_ids))
+
+    if genre_ids:
+        statement = statement.join(GenreBookLink).where(GenreBookLink.genre_id.in_(genre_ids))
+
+    total_statement = select(func.count()).select_from(statement.subquery())
+    total = session.exec(total_statement).one()
+
+    offset = (page - 1) * size
+    statement = statement.offset(offset).limit(size)
+    results = session.exec(statement).all()
+
+    books_with_data = []
+    for db_book in results:
+        books_with_data.append(
+            BookWithAuthorsAndGenres(
+                **db_book.model_dump(),
+                authors=[AuthorRead(**a.model_dump()) for a in db_book.authors],
+                genres=[GenreRead(**g.model_dump()) for g in db_book.genres]
+            )
+        )
+
+    return BookFilteredList(books=books_with_data, total=total)
+
+
 @router.post(
     "/",
     response_model=Book,
@@ -127,51 +175,3 @@ def delete_book(
     session.delete(book)
     session.commit()
     return book_read
-
-
-@router.get(
-    "/filter",
-    response_model=BookFilteredList,
-    summary="Фильтрация книг",
-    description="Фильтрация списка книг по названию, авторам и жанрам с пагинацией"
-)
-def filter_books(
-    session: Session = Depends(get_session),
-    q: str | None = Query(None, min_length=3, max_length=50, description="Поиск"),
-    author_ids: List[int] | None = Query(None, description="Список ID авторов"),
-    genre_ids: List[int] | None = Query(None, description="Список ID жанров"),
-    page: int = Query(1, gt=0, description="Номер страницы"),
-    size: int = Query(20, gt=0, lt=101, description="Количество элементов на странице"),
-):
-    """Эндпоинт получения отфильтрованного списка книг"""
-    statement = select(Book).distinct()
-
-    if q:
-        statement = statement.where(
-            (col(Book.title).ilike(f"%{q}%")) | (col(Book.description).ilike(f"%{q}%"))
-        )
-
-    if author_ids:
-        statement = statement.join(AuthorBookLink).where(AuthorBookLink.author_id.in_(author_ids))
-
-    if genre_ids:
-        statement = statement.join(GenreBookLink).where(GenreBookLink.genre_id.in_(genre_ids))
-
-    total_statement = select(func.count()).select_from(statement.subquery())
-    total = session.exec(total_statement).one()
-
-    offset = (page - 1) * size
-    statement = statement.offset(offset).limit(size)
-    results = session.exec(statement).all()
-
-    books_with_data = []
-    for db_book in results:
-        books_with_data.append(
-            BookWithAuthorsAndGenres(
-                **db_book.model_dump(),
-                authors=[AuthorRead(**a.model_dump()) for a in db_book.authors],
-                genres=[GenreRead(**g.model_dump()) for g in db_book.genres]
-            )
-        )
-
-    return BookFilteredList(books=books_with_data, total=total)

library_service/routers/misc.py

@@ -22,33 +22,33 @@ def get_info(app) -> Dict:
         "app_info": {
             "title": app.title,
             "version": app.version,
-            "description": app.description,
+            "description": app.description.rsplit('|', 1)[0],
         },
         "server_time": datetime.now().isoformat(),
     }
 
 
 @router.get("/", include_in_schema=False)
-async def root(request: Request, app=Depends(get_app)):
+async def root(request: Request, app=Depends(lambda: get_app())):
     """Эндпоинт главной страницы"""
     return RedirectResponse("/books")
 
 
 @router.get("/books", include_in_schema=False)
-async def books(request: Request, app=Depends(get_app)):
+async def books(request: Request, app=Depends(lambda: get_app())):
     """Эндпоинт страницы выбора книг"""
     return templates.TemplateResponse(request, "books.html", get_info(app))
 
 
 @router.get("/auth", include_in_schema=False)
-async def root(request: Request, app=Depends(get_app)):
+async def auth(request: Request, app=Depends(lambda: get_app())):
     """Эндпоинт страницы авторизации"""
     return templates.TemplateResponse(request, "auth.html", get_info(app))
 
 
 
 @router.get("/api", include_in_schema=False)
-async def root(request: Request, app=Depends(get_app)):
+async def api(request: Request, app=Depends(lambda: get_app())):
     """Страница с сылками на документацию API"""
     return templates.TemplateResponse(request, "api.html", get_info(app))
 
@@ -72,6 +72,6 @@ async def favicon():
     summary="Информация о сервисе",
     description="Возвращает информацию о системе",
 )
-async def api_info(app=Depends(get_app)):
+async def api_info(app=Depends(lambda: get_app())):
     """Эндпоинт информации об API"""
     return JSONResponse(content=get_info(app))

library_service/settings.py

@@ -12,12 +12,12 @@ with open("pyproject.toml", 'r', encoding='utf-8') as f:
     config = load(f)
 
 
-def get_app(lifespan=None) -> FastAPI:
+def get_app(lifespan=None, /) -> FastAPI:
     """Dependency для получения экземпляра FastAPI application"""
     if not hasattr(get_app, 'instance'):
         get_app.instance = FastAPI(
             title=config["tool"]["poetry"]["name"],
-            description=config["tool"]["poetry"]["description"],
+            description=config["tool"]["poetry"]["description"] + " | [Вернутьсяна главную](/)",
             version=config["tool"]["poetry"]["version"],
             lifespan=lifespan,
             openapi_tags=[