diff --git a/app/core/entities/delivery_accessory.py b/app/core/entities/delivery_accessory.py index 33f841d..ddd8e13 100644 --- a/app/core/entities/delivery_accessory.py +++ b/app/core/entities/delivery_accessory.py @@ -6,6 +6,7 @@ class DeliveryAccessoryEntity(BaseModel): id: Optional[int] = None queue: int count: int + accessory_volume: Optional[float] = None accessory_id: Optional[int] = None accessory_name: Optional[str] = None city_name: Optional[str] = None diff --git a/app/core/entities/delivery_order.py b/app/core/entities/delivery_order.py index b422ec0..ab454ef 100644 --- a/app/core/entities/delivery_order.py +++ b/app/core/entities/delivery_order.py @@ -12,6 +12,7 @@ class DeliveryOrderEntity(BaseModel): estimated_route_time_in_minutes: Optional[int] = None route: Optional[List[List[float]]] = None truck_name: Optional[str] = None + truck_capacity: Optional[float] = None truck_id: Optional[int] = None total_order_id: Optional[int] = None diff --git a/app/core/usecases/delivery_accessory_service.py b/app/core/usecases/delivery_accessory_service.py index 0d8a5f6..0eb76c9 100644 --- a/app/core/usecases/delivery_accessory_service.py +++ b/app/core/usecases/delivery_accessory_service.py @@ -31,6 +31,7 @@ class DeliveryAccessoriesService: id=da.id, queue=da.queue, count=da.count, + accessory_volume=da.accessory.volume, accessory_id=da.accessory_id, delivery_order_id=da.delivery_order_id, accessory_name=da.accessory.name, diff --git a/app/core/usecases/delivery_order_service.py b/app/core/usecases/delivery_order_service.py index 9387146..d78a3bf 100644 --- a/app/core/usecases/delivery_order_service.py +++ b/app/core/usecases/delivery_order_service.py @@ -22,6 +22,7 @@ class DeliveryOrdersService: price=round(o.price, 2), truck_id=o.truck_id, truck_name=o.truck.name, + truck_capacity=o.truck.capacity, total_order_id=o.total_order_id, estimated_route_time_in_minutes=o.estimated_route_time_in_minutes, ) @@ -39,6 +40,7 @@ class DeliveryOrdersService: price=o.price, truck_id=o.truck_id, truck_name=o.truck.name, + truck_capacity=o.truck.capacity, total_order_id=o.total_order_id, estimated_route_time_in_minutes=o.estimated_route_time_in_minutes, route=o.route, @@ -57,6 +59,7 @@ class DeliveryOrdersService: price=delivery_order.price, truck_id=delivery_order.truck_id, truck_name=delivery_order.truck.name, + truck_capacity=delivery_order.truck.capacity, total_order_id=delivery_order.total_order_id, estimated_route_time_in_minutes=delivery_order.estimated_route_time_in_minutes, route=delivery_order.route, diff --git a/app/core/usecases/new_total_order_service.py b/app/core/usecases/new_total_order_service.py index c9bd4b1..6cd87e7 100644 --- a/app/core/usecases/new_total_order_service.py +++ b/app/core/usecases/new_total_order_service.py @@ -85,7 +85,7 @@ class NewTotalOrderService: new_delivery_accessory = DeliveryAccessory( queue=point_index + 1, - count=accessory.count, + count=round(accessory.count * self.robotsCount / 100), accessory_id=accessory.id, delivery_order_id=new_delivery_order.id, )