Рефактор

app/services/waybill_poller.py

@@ -27,8 +27,8 @@ class CDEKWaybillInfoAdapterProtocol(Protocol):
 
 class OrderRecord(Protocol):
     order_uuid: str
-    cdek_order_uuid: str | None
-    cdek_waybill_uuid: str | None
+    provider_order_id: str | None
+    provider_waybill_id: str | None
 
 
 class WaybillPollerRepositoryProtocol(Protocol):
@@ -97,8 +97,8 @@ class WaybillPollerService:
                     logger.exception(
                         "waybill_poll_order_failed",
                         order_uuid=order.order_uuid,
-                        cdek_order_uuid=order.cdek_order_uuid,
-                        cdek_waybill_uuid=order.cdek_waybill_uuid,
+                        provider_order_id=order.provider_order_id,
+                        provider_waybill_id=order.provider_waybill_id,
                     )
             return PollBatchSummary(
                 processed=len(orders),
@@ -133,11 +133,11 @@ class WaybillPollerService:
 
     async def _handle_order(self, session: object, order: OrderRecord) -> None:
         polled_at = self._datetime_now()
-        if order.cdek_waybill_uuid is None:
-            cdek_order_uuid = order.cdek_order_uuid
-            if cdek_order_uuid is None:
+        if order.provider_waybill_id is None:
+            provider_order_id = order.provider_order_id
+            if provider_order_id is None:
                 return
-            info = await self._order_info_adapter.get_order(cdek_order_uuid)
+            info = await self._order_info_adapter.get_order(provider_order_id)
             await self._repository.record_order_poll(
                 session,
                 order_uuid=order.order_uuid,
@@ -148,13 +148,15 @@ class WaybillPollerService:
             logger.info(
                 "waybill_poll_order_result",
                 order_uuid=order.order_uuid,
-                cdek_order_uuid=cdek_order_uuid,
-                cdek_order_status=info.status_code,
-                cdek_waybill_uuid=info.waybill_uuid,
+                provider_order_id=provider_order_id,
+                provider_order_status=info.status_code,
+                provider_waybill_id=info.waybill_uuid,
             )
             return
 
-        waybill = await self._waybill_info_adapter.get_waybill(order.cdek_waybill_uuid)
+        waybill = await self._waybill_info_adapter.get_waybill(
+            order.provider_waybill_id
+        )
         await self._repository.record_waybill_poll(
             session,
             order_uuid=order.order_uuid,
@@ -164,6 +166,6 @@ class WaybillPollerService:
         logger.info(
             "waybill_poll_waybill_result",
             order_uuid=order.order_uuid,
-            cdek_waybill_uuid=order.cdek_waybill_uuid,
-            cdek_waybill_url=waybill.url,
+            provider_waybill_id=order.provider_waybill_id,
+            provider_waybill_url=waybill.url,
         )