feat: a lot of a lot

This commit is contained in:
2024-09-01 21:45:24 +03:00
parent 4ae03284a3
commit 6ad78df35d
12 changed files with 270 additions and 62 deletions

View File

@@ -178,7 +178,8 @@ class DealService(BaseService):
)
.options(
selectinload(Deal.status_history),
joinedload(Deal.client)
joinedload(Deal.client),
joinedload(Deal.shipping_warehouse),
)
.outerjoin(
price_subquery, Deal.id == price_subquery.c.deal_id)
@@ -202,6 +203,7 @@ class DealService(BaseService):
base_marketplace = None
if deal.base_marketplace:
base_marketplace = BaseMarketplaceSchema.model_validate(deal.base_marketplace)
shipment_warehouse_name = deal.shipping_warehouse.name if deal.shipping_warehouse else None
summaries.append(
DealSummary(
id=deal.id,
@@ -214,7 +216,8 @@ class DealService(BaseService):
rank=rank,
base_marketplace=base_marketplace,
created_at=deal.created_at,
shipment_warehouse_id=deal.shipping_warehouse_id
shipment_warehouse_id=deal.shipping_warehouse_id,
shipment_warehouse_name=shipment_warehouse_name
)
)
return DealSummaryResponse(summaries=summaries)