Take order delivery names/dates from db

Author: cotanoine

app/modules/amap/cruds_amap.py

@@ -248,9 +248,11 @@ async def get_products_of_order(
 async def add_order_to_delivery(
     db: AsyncSession,
     order: schemas_amap.OrderComplete,
+    delivery: models_amap.Delivery,
 ):
     db.add(
         models_amap.Order(
+            delivery=delivery,
             **order.model_dump(exclude={"products_ids", "products_quantity"}),
         ),
     )

app/modules/amap/endpoints_amap.py

@@ -359,7 +359,14 @@ async def get_orders_from_delivery(
             schemas_amap.ProductQuantity(**product.__dict__)
             for product in order_content
         ]
-        res.append(schemas_amap.OrderReturn(productsdetail=products, **order.__dict__))
+        res.append(
+            schemas_amap.OrderReturn(
+                productsdetail=products,
+                delivery_date=delivery.delivery_date,
+                delivery_name=delivery.name,
+                **order.__dict__,
+            ),
+        )
     return res
 
 
@@ -384,7 +391,12 @@ async def get_order_by_id(
         raise HTTPException(status_code=404, detail="Delivery not found")
 
     products = await cruds_amap.get_products_of_order(db=db, order_id=order_id)
-    return schemas_amap.OrderReturn(productsdetail=products, **order.__dict__)
+    return schemas_amap.OrderReturn(
+        productsdetail=products,
+        delivery_name=order.delivery.name,
+        delivery_date=order.delivery.delivery_date,
+        **order.__dict__,
+    )
 
 
 @module.router.post(
@@ -443,7 +455,6 @@ async def add_order_to_delievery(
         order_id=order_id,
         amount=amount,
         ordering_date=ordering_date,
-        delivery_date=delivery.delivery_date,
         **order.model_dump(),
     )
     balance: models_amap.Cash | None = await cruds_amap.get_cash_by_id(

app/modules/amap/models_amap.py

@@ -58,7 +58,10 @@ class Delivery(Base):
         index=True,
     )
     status: Mapped[DeliveryStatusType] = mapped_column(String)
-    orders: Mapped[list["Order"]] = relationship("Order", init=False)
+    orders: Mapped[list["Order"]] = relationship(
+        init=False,
+        back_populates="delivery",
+    )
     products: Mapped[list[Product]] = relationship(
         "Product",
         secondary="amap_delivery_content",
@@ -76,12 +79,13 @@ class Order(Base):
         ForeignKey("amap_delivery.id"),
         index=True,
     )
-    delivery_name: Mapped[str]
     order_id: Mapped[str] = mapped_column(primary_key=True, index=True)
     amount: Mapped[float]
     collection_slot: Mapped[AmapSlotType]
     ordering_date: Mapped[datetime]
-    delivery_date: Mapped[date]
+    delivery: Mapped["Delivery"] = relationship(
+        back_populates="orders",
+    )
     user: Mapped[CoreUser] = relationship(
         "CoreUser",
         init=False,

app/modules/amap/schemas_amap.py

@@ -70,7 +70,6 @@ class DeliveryProductsUpdate(BaseModel):
 class OrderBase(BaseModel):
     user_id: str
     delivery_id: str
-    delivery_name: str
     products_ids: list[str]
     collection_slot: AmapSlotType
     products_quantity: list[int]
@@ -80,7 +79,6 @@ class OrderComplete(OrderBase):
     order_id: str
     amount: float
     ordering_date: datetime
-    delivery_date: date
     model_config = ConfigDict(from_attributes=True)