From 67dccea2b8491c0ea971f758fcf0cb2f722a2444 Mon Sep 17 00:00:00 2001
From: andrei <andrei@duvakin.ru>
Date: Tue, 8 Oct 2024 11:20:56 +0500
Subject: [PATCH] ._.

---
 app/core/entities/delivery_accessory.py                    | 2 +-
 app/core/usecases/delivery_accessory_service.py            | 6 +-----
 app/infrastructure/database/models/delivery_accessories.py | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/core/entities/delivery_accessory.py b/app/core/entities/delivery_accessory.py
index ddd8e13..a707f18 100644
--- a/app/core/entities/delivery_accessory.py
+++ b/app/core/entities/delivery_accessory.py
@@ -5,8 +5,8 @@ from typing import Optional
 class DeliveryAccessoryEntity(BaseModel):
     id: Optional[int] = None
     queue: int
-    count: int
     accessory_volume: Optional[float] = None
+    accessory_weight: Optional[float] = None
     accessory_id: Optional[int] = None
     accessory_name: Optional[str] = None
     city_name: Optional[str] = None
diff --git a/app/core/usecases/delivery_accessory_service.py b/app/core/usecases/delivery_accessory_service.py
index 0eb76c9..832fff9 100644
--- a/app/core/usecases/delivery_accessory_service.py
+++ b/app/core/usecases/delivery_accessory_service.py
@@ -17,7 +17,6 @@ class DeliveryAccessoriesService:
             DeliveryAccessoryEntity(
                 id=da.id,
                 queue=da.queue,
-                count=da.count,
                 accessory_id=da.accessory_id,
                 delivery_order_id=da.delivery_order_id
             )
@@ -30,8 +29,8 @@ class DeliveryAccessoriesService:
             DeliveryAccessoryEntity(
                 id=da.id,
                 queue=da.queue,
-                count=da.count,
                 accessory_volume=da.accessory.volume,
+                accessory_weight=da.accessory.weight,
                 accessory_id=da.accessory_id,
                 delivery_order_id=da.delivery_order_id,
                 accessory_name=da.accessory.name,
@@ -48,7 +47,6 @@ class DeliveryAccessoriesService:
             return DeliveryAccessoryEntity(
                 id=delivery_accessory.id,
                 queue=delivery_accessory.queue,
-                count=delivery_accessory.count,
                 accessory_id=delivery_accessory.accessory_id,
                 delivery_order_id=delivery_accessory.delivery_order_id
             )
@@ -65,7 +63,6 @@ class DeliveryAccessoriesService:
         return DeliveryAccessoryEntity(
             id=created_delivery_accessory.id,
             queue=created_delivery_accessory.queue,
-            count=created_delivery_accessory.count,
             accessory_id=created_delivery_accessory.accessory_id,
             delivery_order_id=created_delivery_accessory.delivery_order_id
         )
@@ -82,7 +79,6 @@ class DeliveryAccessoriesService:
             return DeliveryAccessoryEntity(
                 id=delivery_accessory_model.id,
                 queue=delivery_accessory_model.queue,
-                count=delivery_accessory_model.count,
                 accessory_id=delivery_accessory_model.accessory_id,
                 delivery_order_id=delivery_accessory_model.delivery_order_id
             )
diff --git a/app/infrastructure/database/models/delivery_accessories.py b/app/infrastructure/database/models/delivery_accessories.py
index 8c0b074..44f5268 100644
--- a/app/infrastructure/database/models/delivery_accessories.py
+++ b/app/infrastructure/database/models/delivery_accessories.py
@@ -9,7 +9,6 @@ class DeliveryAccessory(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     queue = Column(Integer, nullable=False)
-    count = Column(Integer, nullable=False)
 
     accessory_id = Column(Integer, ForeignKey('accessories.id'))
     delivery_order_id = Column(Integer, ForeignKey('delivery_orders.id'))