From 030e4eac24e1db36a22bc46eec7653b43b54b034 Mon Sep 17 00:00:00 2001 From: andrei Date: Tue, 8 Oct 2024 00:48:54 +0500 Subject: [PATCH] ._. --- app/core/usecases/delivery_order_service.py | 2 -- .../database/repository/delivery_order_repository.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/core/usecases/delivery_order_service.py b/app/core/usecases/delivery_order_service.py index 6ad05e8..9387146 100644 --- a/app/core/usecases/delivery_order_service.py +++ b/app/core/usecases/delivery_order_service.py @@ -24,7 +24,6 @@ class DeliveryOrdersService: truck_name=o.truck.name, total_order_id=o.total_order_id, estimated_route_time_in_minutes=o.estimated_route_time_in_minutes, - route=o.route, ) for o in delivery_orders ] @@ -61,7 +60,6 @@ class DeliveryOrdersService: total_order_id=delivery_order.total_order_id, estimated_route_time_in_minutes=delivery_order.estimated_route_time_in_minutes, route=delivery_order.route, - ) return None diff --git a/app/infrastructure/database/repository/delivery_order_repository.py b/app/infrastructure/database/repository/delivery_order_repository.py index 0b8b4ec..20e0f15 100644 --- a/app/infrastructure/database/repository/delivery_order_repository.py +++ b/app/infrastructure/database/repository/delivery_order_repository.py @@ -1,3 +1,4 @@ +from sqlalchemy import asc from sqlalchemy.orm import Session, joinedload from app.infrastructure.database.models.delivery_orders import DeliveryOrder @@ -17,6 +18,7 @@ class DeliveryOrdersRepository: def get_all_by_total_order_id(self, total_order_id): return self.db.query(DeliveryOrder).filter(DeliveryOrder.total_order_id == total_order_id) \ .options(joinedload(DeliveryOrder.truck)) \ + .order_by(asc(DeliveryOrder.id)) \ .all() def get_by_id(self, delivery_order_id: int):