._.

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
 

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):