Revert "feat: status and board in deal schema"
This reverts commit b9ae3bc18a.
This commit is contained in:
@ -1,7 +1,6 @@
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import joinedload
|
||||
|
||||
from models import Deal, CardStatusHistory, Board
|
||||
from repositories.base import BaseRepository
|
||||
@ -23,11 +22,7 @@ class DealRepository(BaseRepository):
|
||||
id: Optional[int],
|
||||
name: Optional[str],
|
||||
) -> tuple[list[Deal], int]:
|
||||
stmt = (
|
||||
select(Deal)
|
||||
.options(joinedload(Deal.status), joinedload(Deal.board))
|
||||
.where(Deal.is_deleted.is_(False))
|
||||
)
|
||||
stmt = select(Deal).where(Deal.is_deleted.is_(False))
|
||||
|
||||
if id:
|
||||
stmt = stmt.where(Deal.id == id)
|
||||
@ -54,11 +49,7 @@ class DealRepository(BaseRepository):
|
||||
return list(result.scalars().all()), total_items
|
||||
|
||||
async def get_by_id(self, deal_id: int) -> Optional[Deal]:
|
||||
stmt = (
|
||||
select(Deal)
|
||||
.options(joinedload(Deal.status), joinedload(Deal.board))
|
||||
.where(Deal.id == deal_id, Deal.is_deleted.is_(False))
|
||||
)
|
||||
stmt = select(Deal).where(Deal.id == deal_id, Deal.is_deleted.is_(False))
|
||||
result = await self.session.execute(stmt)
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
@ -67,8 +58,7 @@ class DealRepository(BaseRepository):
|
||||
self.session.add(deal)
|
||||
await self.session.commit()
|
||||
await self.session.refresh(deal)
|
||||
print(deal.id)
|
||||
return await self.get_by_id(deal.id)
|
||||
return deal
|
||||
|
||||
async def update(self, deal: Deal, data: UpdateDealSchema) -> Deal:
|
||||
deal.lexorank = data.lexorank if data.lexorank else deal.lexorank
|
||||
|
||||
Reference in New Issue
Block a user