Compare commits
2 Commits
b9ae3bc18a
...
404a58735d
| Author | SHA1 | Date | |
|---|---|---|---|
| 404a58735d | |||
| de5ffed7de |
@ -21,7 +21,7 @@ class Deal(BaseModel, IdMixin, SoftDeleteMixin, CreatedAtMixin):
|
|||||||
nullable=False,
|
nullable=False,
|
||||||
comment="Текущий статус",
|
comment="Текущий статус",
|
||||||
)
|
)
|
||||||
status: Mapped["Status"] = relationship(lazy="noload")
|
status: Mapped["Status"] = relationship()
|
||||||
|
|
||||||
board_id: Mapped[int] = mapped_column(
|
board_id: Mapped[int] = mapped_column(
|
||||||
ForeignKey("boards.id"), nullable=True, server_default="1"
|
ForeignKey("boards.id"), nullable=True, server_default="1"
|
||||||
|
|||||||
@ -67,12 +67,12 @@ 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 await self.get_by_id(deal.id)
|
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
|
||||||
deal.name = data.name if data.name else deal.name
|
deal.name = data.name if data.name else deal.name
|
||||||
|
deal.board_id = data.board_id if data.board_id else deal.board_id
|
||||||
|
|
||||||
if data.status_id and deal.status_id != data.status_id:
|
if data.status_id and deal.status_id != data.status_id:
|
||||||
deal.status_history.append(
|
deal.status_history.append(
|
||||||
|
|||||||
@ -28,6 +28,7 @@ class CreateDealSchema(BaseSchema):
|
|||||||
class UpdateDealSchema(BaseSchema):
|
class UpdateDealSchema(BaseSchema):
|
||||||
name: Optional[str] = None
|
name: Optional[str] = None
|
||||||
lexorank: Optional[str] = None
|
lexorank: Optional[str] = None
|
||||||
|
board_id: Optional[int] = None
|
||||||
status_id: Optional[int] = None
|
status_id: Optional[int] = None
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user