Добавлен провайдер доставки CSE: SOAP-адаптер (Calc + SaveDocuments), маршрутизация init-payment по провайдеру, обобщение tariff_code до строки, география CSE в cities_map

app/repositories/order/models.py

@@ -32,7 +32,12 @@ class Order(Base):
     order_uuid: Mapped[str] = mapped_column(String(128), nullable=False)
     payment_url: Mapped[str] = mapped_column(String(2048), nullable=False)
     price: Mapped[int] = mapped_column(Integer, nullable=False)
-    tariff_code: Mapped[int] = mapped_column(Integer, nullable=False)
+    tariff_code: Mapped[str] = mapped_column(String(128), nullable=False)
+    provider: Mapped[str] = mapped_column(
+        String(32),
+        nullable=False,
+        server_default="cdek",
+    )
     account_email: Mapped[str] = mapped_column(String(320), nullable=False)
     payload: Mapped[dict[str, Any]] = mapped_column(
         _json_payload_type(),
@@ -41,6 +46,7 @@ class Order(Base):
     payment_status: Mapped[str | None] = mapped_column(String(64), nullable=True)
     tbank_payment_id: Mapped[int | None] = mapped_column(BigInteger, nullable=True)
     cdek_order_uuid: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    cse_order_number: Mapped[str | None] = mapped_column(String(128), nullable=True)
     cdek_order_status: Mapped[str | None] = mapped_column(String(64), nullable=True)
     cdek_waybill_uuid: Mapped[str | None] = mapped_column(String(128), nullable=True)
     cdek_waybill_url: Mapped[str | None] = mapped_column(String(2048), nullable=True)

app/repositories/order/repository.py

@@ -18,7 +18,8 @@ class OrderData:
     order_uuid: str
     payment_url: str
     price: int
-    tariff_code: int
+    tariff_code: str
+    provider: str
     account_email: str
     payload: dict[str, Any]
 
@@ -36,6 +37,7 @@ class OrderRepository:
             payment_url=order_data.payment_url,
             price=order_data.price,
             tariff_code=order_data.tariff_code,
+            provider=order_data.provider,
             account_email=order_data.account_email,
             payload=order_data.payload,
         )
@@ -84,6 +86,20 @@ class OrderRepository:
         await session.flush()
         return order
 
+    async def mark_cse_order_registered(
+        self,
+        session: AsyncSession,
+        order_uuid: str,
+        cse_order_number: str,
+    ) -> Order | None:
+        order = await self.get_order_by_order_uuid(session, order_uuid)
+        if order is None:
+            return None
+
+        order.cse_order_number = cse_order_number
+        await session.flush()
+        return order
+
     async def list_orders_pending_waybill(
         self,
         session: AsyncSession,