добавлено получение накладной в cse

2026-06-27 07:10:31 +03:00
parent 2d8f31d3d9
commit facdde00c9
14 changed files with 581 additions and 100 deletions
@@ -1,13 +1,21 @@
-"""Background worker that e-mails CDEK waybill PDFs."""
+"""Background worker that e-mails provider waybill PDFs."""

 import asyncio
 import signal
+from dataclasses import dataclass

 import httpx
 import structlog

+from app.adapters.delivery_providers.registry import (
+    resolve_delivery_provider_timeout_seconds,
+)
 from app.adapters.delivery_providers.cdek.auth import CDEKAuthClient
 from app.adapters.delivery_providers.cdek.client import CDEKClient
+from app.adapters.delivery_providers.cse.client import CSEClient
+from app.adapters.delivery_providers.cse.order_mapper import (
+    CSEOrderRegistrationParams,
+)
 from app.adapters.email import SMTPEmailSender
 from app.adapters.postgres.engine import (
    create_postgres_engine,
@@ -21,24 +29,71 @@ from app.services.waybill_email_sender import WaybillEmailSenderService
 logger = structlog.get_logger(__name__)


+@dataclass(frozen=True)
+class CDEKWaybillPDFDownloader:
+    client: CDEKClient
+
+    async def download_waybill_pdf(self, order: object) -> bytes:
+        url = getattr(order, "provider_waybill_url", None)
+        if not isinstance(url, str) or not url:
+            raise RuntimeError("CDEK waybill URL is missing.")
+        return await self.client.download_waybill_pdf(url)
+
+
+@dataclass(frozen=True)
+class CSEWaybillPDFDownloader:
+    client: CSEClient
+
+    async def download_waybill_pdf(self, order: object) -> bytes:
+        waybill_number = getattr(order, "provider_waybill_id", None)
+        if not isinstance(waybill_number, str) or not waybill_number:
+            raise RuntimeError("CSE waybill number is missing.")
+        return await self.client.download_waybill_pdf(waybill_number)
+
+
 async def _run(settings: Settings, stop_event: asyncio.Event) -> None:
+    http_client = httpx.AsyncClient(
+        timeout=resolve_delivery_provider_timeout_seconds(settings.delivery_providers)
+    )
+    waybill_downloaders: dict[str, object] = {}
+
    cdek_config = settings.delivery_providers.cdek
-    http_client = httpx.AsyncClient(timeout=cdek_config.timeout_seconds)
-    auth_client = CDEKAuthClient(
-        http_client=http_client,
-        base_url=cdek_config.base_url,
-        client_id=cdek_config.client_id,
-        client_secret=cdek_config.client_secret,
-        timeout_seconds=cdek_config.timeout_seconds,
-    )
-    cdek_client = CDEKClient(
-        http_client=http_client,
-        auth_client=auth_client,
-        base_url=cdek_config.base_url,
-        timeout_seconds=cdek_config.timeout_seconds,
-        retry_attempts=cdek_config.retry_attempts,
-        retry_backoff_seconds=cdek_config.retry_backoff_seconds,
-    )
+    if cdek_config.enabled:
+        auth_client = CDEKAuthClient(
+            http_client=http_client,
+            base_url=cdek_config.base_url,
+            client_id=cdek_config.client_id,
+            client_secret=cdek_config.client_secret,
+            timeout_seconds=cdek_config.timeout_seconds,
+        )
+        cdek_client = CDEKClient(
+            http_client=http_client,
+            auth_client=auth_client,
+            base_url=cdek_config.base_url,
+            timeout_seconds=cdek_config.timeout_seconds,
+            retry_attempts=cdek_config.retry_attempts,
+            retry_backoff_seconds=cdek_config.retry_backoff_seconds,
+        )
+        waybill_downloaders["cdek"] = CDEKWaybillPDFDownloader(cdek_client)
+
+    cse_config = settings.delivery_providers.cse
+    if cse_config.enabled:
+        cse_client = CSEClient(
+            http_client=http_client,
+            base_url=cse_config.base_url,
+            login=cse_config.login,
+            password=cse_config.password,
+            registration_params=CSEOrderRegistrationParams(
+                payer=cse_config.payer,
+                payment_method=cse_config.payment_method,
+                shipping_method=cse_config.shipping_method,
+            ),
+            timeout_seconds=cse_config.timeout_seconds,
+            retry_attempts=cse_config.retry_attempts,
+            retry_backoff_seconds=cse_config.retry_backoff_seconds,
+        )
+        waybill_downloaders["cse"] = CSEWaybillPDFDownloader(cse_client)
+
    email_sender = SMTPEmailSender(
        smtp_host=settings.email.smtp_host,
        smtp_port=settings.email.smtp_port,
@@ -53,7 +108,7 @@ async def _run(settings: Settings, stop_event: asyncio.Event) -> None:
    repository = OrderRepository(session_factory=session_factory)
    service = WaybillEmailSenderService(
        order_repository=repository,
-        waybill_downloader=cdek_client,
+        waybill_downloaders=waybill_downloaders,
        email_sender=email_sender,
        batch_size=settings.waybill_email_sender.batch_size,
    )
@@ -1,4 +1,4 @@
-"""Background worker that polls CDEK for waybill updates."""
+"""Background worker that polls delivery providers for waybill updates."""

 import asyncio
 import signal
@@ -6,8 +6,15 @@ import signal
 import httpx
 import structlog

+from app.adapters.delivery_providers.registry import (
+    resolve_delivery_provider_timeout_seconds,
+)
 from app.adapters.delivery_providers.cdek.auth import CDEKAuthClient
 from app.adapters.delivery_providers.cdek.client import CDEKClient
+from app.adapters.delivery_providers.cse.client import CSEClient
+from app.adapters.delivery_providers.cse.order_mapper import (
+    CSEOrderRegistrationParams,
+)
 from app.adapters.postgres.engine import (
    create_postgres_engine,
    create_postgres_session_factory,
@@ -21,30 +28,57 @@ logger = structlog.get_logger(__name__)


 async def _run(settings: Settings, stop_event: asyncio.Event) -> None:
+    http_client = httpx.AsyncClient(
+        timeout=resolve_delivery_provider_timeout_seconds(settings.delivery_providers)
+    )
+    order_info_adapters: dict[str, object] = {}
+    waybill_info_adapters: dict[str, object] = {}
+
    cdek_config = settings.delivery_providers.cdek
-    http_client = httpx.AsyncClient(timeout=cdek_config.timeout_seconds)
-    auth_client = CDEKAuthClient(
-        http_client=http_client,
-        base_url=cdek_config.base_url,
-        client_id=cdek_config.client_id,
-        client_secret=cdek_config.client_secret,
-        timeout_seconds=cdek_config.timeout_seconds,
-    )
-    cdek_client = CDEKClient(
-        http_client=http_client,
-        auth_client=auth_client,
-        base_url=cdek_config.base_url,
-        timeout_seconds=cdek_config.timeout_seconds,
-        retry_attempts=cdek_config.retry_attempts,
-        retry_backoff_seconds=cdek_config.retry_backoff_seconds,
-    )
+    if cdek_config.enabled:
+        auth_client = CDEKAuthClient(
+            http_client=http_client,
+            base_url=cdek_config.base_url,
+            client_id=cdek_config.client_id,
+            client_secret=cdek_config.client_secret,
+            timeout_seconds=cdek_config.timeout_seconds,
+        )
+        cdek_client = CDEKClient(
+            http_client=http_client,
+            auth_client=auth_client,
+            base_url=cdek_config.base_url,
+            timeout_seconds=cdek_config.timeout_seconds,
+            retry_attempts=cdek_config.retry_attempts,
+            retry_backoff_seconds=cdek_config.retry_backoff_seconds,
+        )
+        order_info_adapters["cdek"] = cdek_client
+        waybill_info_adapters["cdek"] = cdek_client
+
+    cse_config = settings.delivery_providers.cse
+    if cse_config.enabled:
+        cse_client = CSEClient(
+            http_client=http_client,
+            base_url=cse_config.base_url,
+            login=cse_config.login,
+            password=cse_config.password,
+            registration_params=CSEOrderRegistrationParams(
+                payer=cse_config.payer,
+                payment_method=cse_config.payment_method,
+                shipping_method=cse_config.shipping_method,
+            ),
+            timeout_seconds=cse_config.timeout_seconds,
+            retry_attempts=cse_config.retry_attempts,
+            retry_backoff_seconds=cse_config.retry_backoff_seconds,
+        )
+        order_info_adapters["cse"] = cse_client
+
    engine = create_postgres_engine(settings.postgres)
    session_factory = create_postgres_session_factory(engine)
    repository = OrderRepository(session_factory=session_factory)
    service = WaybillPollerService(
        order_repository=repository,
-        order_info_adapter=cdek_client,
-        waybill_info_adapter=cdek_client,
+        order_info_adapters=order_info_adapters,
+        waybill_info_adapters=waybill_info_adapters,
        batch_size=settings.waybill_poller.batch_size,
    )
    logger.info(