fakz9/Crm-Backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat: status and board in deal schema"

Browse Source 
This reverts commit b9ae3bc18a.
This commit is contained in:
AlexSserb
2025-09-01 20:39:20 +04:00
parent b9ae3bc18a
commit de5ffed7de
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
repositories/deal.py
View File

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

6
schemas/deal.py
View File

@ -2,8 +2,6 @@ from datetime import datetime
from typing import Optional from typing import Optional
from schemas.base import BaseSchema, BaseResponse, PaginationInfoSchema from schemas.base import BaseSchema, BaseResponse, PaginationInfoSchema
from schemas.board import BoardSchema
from schemas.status import StatusSchema
# region Entities # region Entities
@ -13,8 +11,8 @@ class DealSchema(BaseSchema):
id: int id: int
name: str name: str
lexorank: str lexorank: str
status: StatusSchema status_id: int
board: BoardSchema board_id: int
created_at: datetime created_at: datetime