Skip to content

Commit 937d82b

Browse files
author
JeremyAndress
committed
ADD: schemas pagination user response:hammer:
1 parent f50d471 commit 937d82b

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

src/api/gem/user/controller.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ def create_user(db: Session,obj_in: UserCreate):
3434
logger.error(f'error {e}')
3535
return arsene
3636

37-
def get_all_user_cn(db: Session):
38-
user = paginate(db.query(User),1,2)
37+
def get_all_user_cn(page,db: Session):
38+
user = paginate(db.query(User),page,2)
3939
return user

src/api/gem/user/user.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from fastapi import APIRouter, Depends, HTTPException
33
from fastapi.security import OAuth2PasswordRequestForm
44
from db.session import get_db
5-
from schemas.user import UserCreate,UserList
5+
from schemas.user import UserCreate,UserList, UserListPag
66
from schemas.response import Response_SM
77
from schemas.token import Token
88
from core.security import create_access_token
@@ -35,10 +35,11 @@ def user_get(db: Session = Depends(get_db),current_user: UserCreate = Depends(ge
3535
print(dir(user))
3636
return user
3737

38-
@router.get("/get_all_user/")
38+
@router.get("/get_all_user/",response_model=UserListPag)
3939
def get_all_user(
40+
page:int,
4041
db: Session = Depends(get_db),
4142
current_user: UserCreate = Depends(get_current_active_user)
4243
):
43-
user = get_all_user_cn(db)
44+
user = get_all_user_cn(page,db)
4445
return user

src/schemas/response.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@
33

44
class Response_SM(BaseModel):
55
status: bool
6-
result: str
6+
result: str
7+
8+
class Pagination(BaseModel):
9+
previous_page:Optional[int]
10+
next_page: Optional[int]
11+
total: Optional[int]
12+
pages: Optional[int]

src/schemas/user.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from typing import Optional
1+
from typing import Optional,List
22
from pydantic import BaseModel
3-
3+
from .response import Pagination
44
# Shared properties
55
class UserBase(BaseModel):
66
username: Optional[str] = None
@@ -11,5 +11,10 @@ class UserCreate(UserBase):
1111

1212
class UserList(UserCreate):
1313
id: int
14+
class Config:
15+
orm_mode = True
16+
17+
class UserListPag(Pagination):
18+
data: List[UserList]
1419
class Config:
1520
orm_mode = True

0 commit comments

Comments
 (0)