ADD: pagination:hammer:

Author: JeremyAndress

src/api/gem/user/controller.py

@@ -1,5 +1,6 @@
 from sqlalchemy.orm import Session
 from utils.logging import logger
+from utils.pagination import paginate
 from models.user import User
 from schemas.user import UserCreate
 from schemas.response import Response_SM
@@ -33,3 +34,6 @@ def create_user(db: Session,obj_in: UserCreate):
         logger.error(f'error {e}')
     return arsene
 
+def get_all_user_cn(db: Session):
+    user  = paginate(db.query(User),1,2)
+    return user

src/api/gem/user/user.py

@@ -2,13 +2,14 @@
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.security import OAuth2PasswordRequestForm
 from db.session import get_db
-from schemas.user import UserCreate
+from schemas.user import UserCreate,UserList
 from schemas.response import Response_SM
 from schemas.token import Token
 from core.security import create_access_token
 from api.deps import get_current_active_user
 from .controller import (
-    get_by_email, create_user, authenticate
+    get_by_email, create_user, authenticate,
+    get_all_user_cn
 )
 router = APIRouter()
 
@@ -27,7 +28,17 @@ def login(db: Session = Depends(get_db),form_data: OAuth2PasswordRequestForm = D
         "token_type": "bearer",
     }
 
-@router.get("/get_user_by_email/")
+@router.get("/get_user_by_email/",response_model=UserList)
 def user_get(db: Session = Depends(get_db),current_user: UserCreate = Depends(get_current_active_user)):
     user = get_by_email(db,'prueba')
-    return {"user":user}
+    print(f'user {user}')
+    print(dir(user))
+    return user
+
+@router.get("/get_all_user/")
+def get_all_user(
+    db: Session = Depends(get_db),
+    current_user: UserCreate = Depends(get_current_active_user)
+):
+    user = get_all_user_cn(db)
+    return user

src/core/config.py

@@ -6,7 +6,7 @@ class Settings(BaseSettings):
     API_V1_STR: str = "/api/v1"
     PROJECT_NAME: str = "fasatapi-auth"
     ALGORITHM = "HS256"
-    ACCESS_TOKEN_EXPIRE_MINUTES: int = 1
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = 15
     SECRET_KEY:str = "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7"
 
     MYSQL_SERVER: str = os.getenv('MYSQL_SERVER','30.40.0.10:3307')

src/schemas/user.py

@@ -9,3 +9,7 @@ class UserBase(BaseModel):
 class UserCreate(UserBase):
     password: str
 
+class UserList(UserCreate):
+    id: int
+    class Config:
+        orm_mode = True

src/utils/pagination.py

@@ -0,0 +1,50 @@
+import math
+
+class Page(object):
+
+    def __init__(self, items, page, page_size, total):
+        self.data = items
+        self.previous_page = None
+        self.next_page = None
+        # self.has_previous = page > 1
+        # if self.has_previous:
+        #     self.previous_page = page - 1
+        self.previous_page = page - 1 if page > 1 else None
+        previous_items = (page - 1) * page_size
+        # self.has_next = previous_items + len(items) < total
+        # if self.has_next:
+        #     self.next_page = page + 1
+        has_next = previous_items + len(items) < total
+        self.next_page = page + 1 if has_next else None
+        self.total = total
+        self.pages = int(math.ceil(total / float(page_size)))
+
+
+def paginate(query, page, page_size):
+    if page <= 0:
+        raise AttributeError('page needs to be >= 1')
+    if page_size <= 0:
+        raise AttributeError('page_size needs to be >= 1')
+    items = query.limit(page_size).offset((page - 1) * page_size).all()
+    # We remove the ordering of the query since it doesn't matter for getting a count and
+    # might have performance implications as discussed on this Flask-SqlAlchemy issue
+    # https://github.com/mitsuhiko/flask-sqlalchemy/issues/100
+    total = query.order_by(None).count()
+    return Page(items, page, page_size, total)
+
+
+# def paginate(query, page, per_page=20, error_out=True):
+#     if error_out and page < 1:
+#         abort(404)
+#     items = query.limit(per_page).offset((page - 1) * per_page).all()
+#     if not items and page != 1 and error_out:
+#         abort(404)
+
+#     # No need to count if we're on the first page and there are fewer
+#     # items than we expected.
+#     if page == 1 and len(items) < per_page:
+#         total = len(items)
+#     else:
+#         total = query.order_by(None).count()
+
+#     return Pagination(query, page, per_page, total, items)