Рефактор

app/repositories/order/models.py

@@ -45,12 +45,13 @@ 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)
-    cdek_polled_at: Mapped[datetime | None] = mapped_column(
+    provider_order_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    provider_order_status: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    provider_waybill_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    provider_waybill_url: Mapped[str | None] = mapped_column(
+        String(2048), nullable=True
+    )
+    provider_polled_at: Mapped[datetime | None] = mapped_column(
         DateTime(timezone=True),
         nullable=True,
     )

app/repositories/order/repository.py

@@ -75,31 +75,17 @@ class OrderRepository:
         await session.flush()
         return order
 
-    async def mark_cdek_order_registered(
+    async def mark_provider_order_registered(
         self,
         session: AsyncSession,
         order_uuid: str,
-        cdek_order_uuid: str,
+        provider_order_id: str,
     ) -> Order | None:
         order = await self.get_order_by_order_uuid(session, order_uuid)
         if order is None:
             return None
 
-        order.cdek_order_uuid = cdek_order_uuid
-        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
+        order.provider_order_id = provider_order_id
         await session.flush()
         return order
 
@@ -112,14 +98,15 @@ class OrderRepository:
         statement = (
             select(Order)
             .where(
-                Order.cdek_order_uuid.is_not(None),
-                Order.cdek_waybill_url.is_(None),
+                Order.provider == "cdek",
+                Order.provider_order_id.is_not(None),
+                Order.provider_waybill_url.is_(None),
                 (
-                    Order.cdek_order_status.is_(None)
-                    | Order.cdek_order_status.not_in(TERMINAL_ORDER_STATUSES)
+                    Order.provider_order_status.is_(None)
+                    | Order.provider_order_status.not_in(TERMINAL_ORDER_STATUSES)
                 ),
             )
-            .order_by(Order.cdek_polled_at.asc().nulls_first())
+            .order_by(Order.provider_polled_at.asc().nulls_first())
             .limit(limit)
             .with_for_update(skip_locked=True)
         )
@@ -139,10 +126,10 @@ class OrderRepository:
         if order is None:
             return None
 
-        order.cdek_order_status = order_status
-        if waybill_uuid is not None and order.cdek_waybill_uuid is None:
-            order.cdek_waybill_uuid = waybill_uuid
-        order.cdek_polled_at = polled_at
+        order.provider_order_status = order_status
+        if waybill_uuid is not None and order.provider_waybill_id is None:
+            order.provider_waybill_id = waybill_uuid
+        order.provider_polled_at = polled_at
         await session.flush()
         return order
 
@@ -158,9 +145,9 @@ class OrderRepository:
         if order is None:
             return None
 
-        if waybill_url is not None and order.cdek_waybill_url is None:
-            order.cdek_waybill_url = waybill_url
-        order.cdek_polled_at = polled_at
+        if waybill_url is not None and order.provider_waybill_url is None:
+            order.provider_waybill_url = waybill_url
+        order.provider_polled_at = polled_at
         await session.flush()
         return order
 
@@ -189,7 +176,8 @@ class OrderRepository:
         statement = (
             select(Order)
             .where(
-                Order.cdek_waybill_url.is_not(None),
+                Order.provider == "cdek",
+                Order.provider_waybill_url.is_not(None),
                 Order.waybill_email_sent_at.is_(None),
             )
             .order_by(Order.created_at.asc())