Refactor pagination filters

Author: borys25ol

conduit/api/routes/article.py

@@ -1,10 +1,7 @@
 from fastapi import APIRouter
-from fastapi.params import Query
 from starlette import status
 
 from conduit.api.schemas.requests.article import (
-    DEFAULT_ARTICLES_LIMIT,
-    DEFAULT_ARTICLES_OFFSET,
     CreateArticleRequest,
     UpdateArticleRequest,
 )
@@ -14,6 +11,7 @@
     CurrentUser,
     DBSession,
     IArticleService,
+    Pagination,
     QueryFilters,
 )
 
@@ -22,23 +20,26 @@
 
 @router.get("/feed", response_model=ArticlesFeedResponse)
 async def get_article_feed(
+    pagination: Pagination,
     session: DBSession,
     current_user: CurrentUser,
     article_service: IArticleService,
-    limit: int = Query(DEFAULT_ARTICLES_LIMIT, ge=1),
-    offset: int = Query(DEFAULT_ARTICLES_OFFSET, ge=0),
 ) -> ArticlesFeedResponse:
     """
     Get article feed from following users.
     """
     articles_feed_dto = await article_service.get_articles_feed_v2(
-        session=session, current_user=current_user, limit=limit, offset=offset
+        session=session,
+        current_user=current_user,
+        limit=pagination.limit,
+        offset=pagination.offset,
     )
     return ArticlesFeedResponse.from_dto(dto=articles_feed_dto)
 
 
 @router.get("", response_model=ArticlesFeedResponse)
 async def get_global_article_feed(
+    pagination: Pagination,
     articles_filters: QueryFilters,
     session: DBSession,
     current_user: CurrentOptionalUser,
@@ -53,8 +54,8 @@ async def get_global_article_feed(
         tag=articles_filters.tag,
         author=articles_filters.author,
         favorited=articles_filters.favorited,
-        limit=articles_filters.limit,
-        offset=articles_filters.offset,
+        limit=pagination.limit,
+        offset=pagination.offset,
     )
     return ArticlesFeedResponse.from_dto(dto=articles_feed_dto)
 

conduit/api/schemas/requests/article.py

@@ -2,22 +2,22 @@
 
 from conduit.domain.dtos.article import CreateArticleDTO, UpdateArticleDTO
 
-DEFAULT_ARTICLES_LIMIT = 20
-DEFAULT_ARTICLES_OFFSET = 0
+
+class ArticlesPagination(BaseModel):
+    limit: int = Field(ge=1)
+    offset: int = Field(ge=0)
 
 
 class ArticlesFilters(BaseModel):
     tag: str | None = None
     author: str | None = None
     favorited: str | None = None
-    limit: int = Field(DEFAULT_ARTICLES_LIMIT, ge=1)
-    offset: int = Field(DEFAULT_ARTICLES_OFFSET, ge=0)
 
 
 class CreateArticleData(BaseModel):
-    title: str
-    description: str
-    body: str
+    title: str = Field(..., min_length=5)
+    description: str = Field(min_length=10)
+    body: str = Field(min_length=10)
     tags: list[str] = Field(alias="tagList")
 
 

conduit/core/dependencies.py

@@ -3,11 +3,7 @@
 from fastapi import Depends, Query
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from conduit.api.schemas.requests.article import (
-    DEFAULT_ARTICLES_LIMIT,
-    DEFAULT_ARTICLES_OFFSET,
-    ArticlesFilters,
-)
+from conduit.api.schemas.requests.article import ArticlesFilters, ArticlesPagination
 from conduit.core.container import container
 from conduit.core.security import HTTPTokenHeader
 from conduit.domain.dtos.user import UserDTO
@@ -45,17 +41,22 @@
 IArticleService = Annotated[ArticleService, Depends(container.article_service)]
 ICommentService = Annotated[CommentService, Depends(container.comment_service)]
 
+DEFAULT_ARTICLES_LIMIT = 20
+DEFAULT_ARTICLES_OFFSET = 0
 
-def get_articles_filters(
-    tag: str | None = None,
-    author: str | None = None,
-    favorited: str | None = None,
+
+def get_articles_pagination(
     limit: int = Query(DEFAULT_ARTICLES_LIMIT, ge=1),
     offset: int = Query(DEFAULT_ARTICLES_OFFSET, ge=0),
+) -> ArticlesPagination:
+    limit = min(limit, DEFAULT_ARTICLES_LIMIT)
+    return ArticlesPagination(limit=limit, offset=offset)
+
+
+def get_articles_filters(
+    tag: str | None = None, author: str | None = None, favorited: str | None = None
 ) -> ArticlesFilters:
-    return ArticlesFilters(
-        tag=tag, author=author, favorited=favorited, limit=limit, offset=offset
-    )
+    return ArticlesFilters(tag=tag, author=author, favorited=favorited)
 
 
 async def get_current_user_or_none(
@@ -85,6 +86,7 @@ async def get_current_user(
     return current_user_dto
 
 
+Pagination = Annotated[ArticlesPagination, Depends(get_articles_pagination)]
 QueryFilters = Annotated[ArticlesFilters, Depends(get_articles_filters)]
 CurrentOptionalUser = Annotated[UserDTO | None, Depends(get_current_user_or_none)]
 CurrentUser = Annotated[UserDTO, Depends(get_current_user)]