From c53fdbb063686b9cd1f3cd8f699a2c6f9d4bfb4a Mon Sep 17 00:00:00 2001 From: andrei Date: Tue, 8 Oct 2024 12:46:29 +0500 Subject: [PATCH] ._. --- app/core/entities/calculate_total_order_request.py | 4 +++- app/core/usecases/new_total_order_service.py | 1 - .../database/repository/total_order_repository.py | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/core/entities/calculate_total_order_request.py b/app/core/entities/calculate_total_order_request.py index 06d127e..4b89ab6 100644 --- a/app/core/entities/calculate_total_order_request.py +++ b/app/core/entities/calculate_total_order_request.py @@ -1,6 +1,8 @@ +from datetime import datetime + from pydantic import BaseModel class CalculateTotalOrderRequest(BaseModel): - deadline: str + deadline: datetime robotsCount: int diff --git a/app/core/usecases/new_total_order_service.py b/app/core/usecases/new_total_order_service.py index 6cd87e7..f879d0d 100644 --- a/app/core/usecases/new_total_order_service.py +++ b/app/core/usecases/new_total_order_service.py @@ -85,7 +85,6 @@ class NewTotalOrderService: new_delivery_accessory = DeliveryAccessory( queue=point_index + 1, - count=round(accessory.count * self.robotsCount / 100), accessory_id=accessory.id, delivery_order_id=new_delivery_order.id, ) diff --git a/app/infrastructure/database/repository/total_order_repository.py b/app/infrastructure/database/repository/total_order_repository.py index 1ee4f1e..4c3a9d2 100644 --- a/app/infrastructure/database/repository/total_order_repository.py +++ b/app/infrastructure/database/repository/total_order_repository.py @@ -1,4 +1,6 @@ +from sqlalchemy import desc from sqlalchemy.orm import Session, joinedload + from app.infrastructure.database.models.total_orders import TotalOrder @@ -13,6 +15,7 @@ class TotalOrdersRepository: return self.db.query(TotalOrder) \ .options(joinedload(TotalOrder.user)) \ .options(joinedload(TotalOrder.status)) \ + .order_by(desc(TotalOrder.order_datetime)) \ .all() def get_by_id(self, total_order_id: int):