diff --git a/repositories/board.py b/repositories/board.py index c146b37..721a1a8 100644 --- a/repositories/board.py +++ b/repositories/board.py @@ -11,8 +11,10 @@ from schemas.board import UpdateBoardSchema, CreateBoardSchema class BoardRepository(BaseRepository): async def get_all(self, project_id: int) -> list[Board]: - stmt = select(Board).where( - Board.is_deleted.is_(False), Board.project_id == project_id + stmt = ( + select(Board) + .where(Board.is_deleted.is_(False), Board.project_id == project_id) + .order_by(Board.lexorank) ) result = await self.session.execute(stmt) return list(result.scalars().all()) diff --git a/repositories/deal.py b/repositories/deal.py index f3c46c0..59fa9a6 100644 --- a/repositories/deal.py +++ b/repositories/deal.py @@ -9,7 +9,11 @@ from schemas.deal import UpdateDealSchema class DealRepository(BaseRepository): async def get_all(self, board_id: int) -> list[Deal]: - stmt = select(Deal).where(Deal.is_deleted.is_(False), Deal.board_id == board_id) + stmt = ( + select(Deal) + .where(Deal.is_deleted.is_(False), Deal.board_id == board_id) + .order_by(Deal.lexorank) + ) result = await self.session.execute(stmt) return list(result.scalars().all()) diff --git a/repositories/project.py b/repositories/project.py index fe5b845..c1f69df 100644 --- a/repositories/project.py +++ b/repositories/project.py @@ -11,7 +11,7 @@ from schemas.project import CreateProjectSchema, UpdateProjectSchema class ProjectRepository(BaseRepository): async def get_all(self) -> list[Project]: - stmt = select(Project).where(Project.is_deleted.is_(False)) + stmt = select(Project).where(Project.is_deleted.is_(False)).order_by(Project.id) result = await self.session.execute(stmt) return list(result.scalars().all()) diff --git a/repositories/status.py b/repositories/status.py index ea9326a..9b02533 100644 --- a/repositories/status.py +++ b/repositories/status.py @@ -1,4 +1,3 @@ -from datetime import datetime from typing import Optional from sqlalchemy import select, func @@ -10,8 +9,10 @@ from schemas.status import UpdateStatusSchema, CreateStatusSchema class StatusRepository(BaseRepository): async def get_all(self, board_id: int) -> list[Status]: - stmt = select(Status).where( - Status.is_deleted.is_(False), Status.board_id == board_id + stmt = ( + select(Status) + .where(Status.is_deleted.is_(False), Status.board_id == board_id) + .order_by(Status.lexorank) ) result = await self.session.execute(stmt) return list(result.scalars().all())