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

fix: new deal statuses, delivery date, receiving slot date

Browse Source
This commit is contained in:
admin
2024-09-30 22:53:49 +03:00
parent 590042521d
commit db71481da8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
schemas/deal.py
View File

@@ -40,6 +40,7 @@ class DealSummary(BaseSchema):
delivery_date: Optional[datetime.datetime] = None delivery_date: Optional[datetime.datetime] = None
receiving_slot_date: Optional[datetime.datetime] = None receiving_slot_date: Optional[datetime.datetime] = None
bill_request: Optional[DealBillRequestSchema] = None
class DealServiceSchema(BaseSchema): class DealServiceSchema(BaseSchema):

4
services/deal.py
View File

@@ -208,6 +208,7 @@ class DealService(BaseService):
selectinload(Deal.status_history), selectinload(Deal.status_history),
joinedload(Deal.client), joinedload(Deal.client),
joinedload(Deal.shipping_warehouse), joinedload(Deal.shipping_warehouse),
joinedload(Deal.bill_request)
) )
.outerjoin( .outerjoin(
price_subquery, Deal.id == price_subquery.c.deal_id, price_subquery, Deal.id == price_subquery.c.deal_id,
@@ -252,7 +253,8 @@ class DealService(BaseService):
shipment_warehouse_name=shipment_warehouse_name, shipment_warehouse_name=shipment_warehouse_name,
total_products=products_count, total_products=products_count,
delivery_date=deal.delivery_date, 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) return DealSummaryResponse(summaries=summaries)