From db71481da87a2c8859744a18113bdc146691e85b Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Sep 2024 22:53:49 +0300 Subject: [PATCH] fix: new deal statuses, delivery date, receiving slot date --- schemas/deal.py | 1 + services/deal.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/schemas/deal.py b/schemas/deal.py index dc32e22..cbe706c 100644 --- a/schemas/deal.py +++ b/schemas/deal.py @@ -40,6 +40,7 @@ class DealSummary(BaseSchema): delivery_date: Optional[datetime.datetime] = None receiving_slot_date: Optional[datetime.datetime] = None + bill_request: Optional[DealBillRequestSchema] = None class DealServiceSchema(BaseSchema): diff --git a/services/deal.py b/services/deal.py index c22f74a..b398ed1 100644 --- a/services/deal.py +++ b/services/deal.py @@ -208,6 +208,7 @@ class DealService(BaseService): selectinload(Deal.status_history), joinedload(Deal.client), joinedload(Deal.shipping_warehouse), + joinedload(Deal.bill_request) ) .outerjoin( price_subquery, Deal.id == price_subquery.c.deal_id, @@ -252,7 +253,8 @@ class DealService(BaseService): shipment_warehouse_name=shipment_warehouse_name, total_products=products_count, delivery_date=deal.delivery_date, - receiving_slot_date=deal.receiving_slot_date + receiving_slot_date=deal.receiving_slot_date, + bill_request=deal.bill_request ) ) return DealSummaryResponse(summaries=summaries)