Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Nov 23, 2023
1 parent 5e85be5 commit 33b48c2
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 22 deletions.
30 changes: 16 additions & 14 deletions src/backend/app/projects/project_crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ def get_project_summaries(
# .filter(
# db_models.DbProject.author_id == user_id).offset(skip).limit(limit).all()

project_count, db_projects = get_projects(db, user_id, skip, limit, True, hashtags, search)
project_count, db_projects = get_projects(
db, user_id, skip, limit, True, hashtags, search
)
return project_count, convert_to_project_summaries(db_projects)


Expand Down Expand Up @@ -2858,22 +2860,22 @@ def get_tasks_count(db: Session, project_id: int):
return task_count


def get_pagintaion(page:int, count: int, results_per_page: int, total: int):
def get_pagintaion(page: int, count: int, results_per_page: int, total: int):
total_pages = (count + results_per_page - 1) // results_per_page
if total_pages > 0 and page > total_pages:
page = 1
hasNext = (page * results_per_page) < count
hasPrev = page > 1

pagination=project_schemas.PaginationInfo(
hasNext=hasNext,
hasPrev=hasPrev,
nextNum=page + 1 if hasNext else None,
page=page,
pages=total_pages,
prevNum=page - 1 if hasPrev else None,
perPage=results_per_page,
total=total,
)
return pagination
pagination = project_schemas.PaginationInfo(
hasNext=hasNext,
hasPrev=hasPrev,
nextNum=page + 1 if hasNext else None,
page=page,
pages=total_pages,
prevNum=page - 1 if hasPrev else None,
perPage=results_per_page,
total=total,
)

return pagination
25 changes: 17 additions & 8 deletions src/backend/app/projects/project_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
from shapely.geometry import mapping, shape
from shapely.ops import unary_union
from sqlalchemy.orm import Session
from sqlalchemy import and_

from ..central import central_crud
from ..db import database, db_models
Expand Down Expand Up @@ -135,21 +134,27 @@ async def read_project_summaries(
skip = (page - 1) * results_per_page
limit = results_per_page

project_count, projects = project_crud.get_project_summaries(db, user_id, skip, limit, hashtags, None)
project_count, projects = project_crud.get_project_summaries(
db, user_id, skip, limit, hashtags, None
)

pagination = project_crud.get_pagintaion(page, project_count, results_per_page, total_projects)
pagination = project_crud.get_pagintaion(
page, project_count, results_per_page, total_projects
)
project_summaries = [
project_schemas.ProjectSummary.from_db_project(project) for project in projects
]

response = project_schemas.PaginatedProjectSummaries(
results=project_summaries,
pagination= pagination,
pagination=pagination,
)
return response


@router.get("/search_projects", response_model=project_schemas.PaginatedProjectSummaries)
@router.get(
"/search_projects", response_model=project_schemas.PaginatedProjectSummaries
)
async def search_project(
search: str,
user_id: int = None,
Expand All @@ -168,16 +173,20 @@ async def search_project(
skip = (page - 1) * results_per_page
limit = results_per_page

project_count, projects = project_crud.get_project_summaries(db, user_id, skip, limit, hashtags, search)
project_count, projects = project_crud.get_project_summaries(
db, user_id, skip, limit, hashtags, search
)

pagination = project_crud.get_pagintaion(page, project_count, results_per_page, total_projects)
pagination = project_crud.get_pagintaion(
page, project_count, results_per_page, total_projects
)
project_summaries = [
project_schemas.ProjectSummary.from_db_project(project) for project in projects
]

response = project_schemas.PaginatedProjectSummaries(
results=project_summaries,
pagination= pagination,
pagination=pagination,
)
return response

Expand Down

0 comments on commit 33b48c2

Please sign in to comment.