From 65c07f1da3f04b2bf0688806c42cc0d697a30d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=B0=D0=B8=D1=81=20=D0=AE=D1=81=D1=83=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B5=D0=B2?= <jusupaliev.r@mybook.ru>
Date: Fri, 19 Jun 2026 23:52:46 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=BD=D0=B3=D0=B0=20=D0=BD=D0=B0=D0=BA=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delivery_providers/cdek/order_mapper.py   |  9 +++-
 .../cdek/test_order_info_client.py            |  6 +--
 .../cdek/test_order_mapper.py                 | 46 ++++++++++++++-----
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/app/adapters/delivery_providers/cdek/order_mapper.py b/app/adapters/delivery_providers/cdek/order_mapper.py
index 0d7e79c..4f54191 100644
--- a/app/adapters/delivery_providers/cdek/order_mapper.py
+++ b/app/adapters/delivery_providers/cdek/order_mapper.py
@@ -173,7 +173,14 @@ def _latest_status_code(statuses: object) -> str | None:
 
 
 def _extract_waybill(payload: dict[str, Any]) -> tuple[str | None, str | None]:
-    related_entities = payload.get("related_entities")
+    entity = payload.get("entity")
+    related_entities = (
+        entity.get("related_entities")
+        if isinstance(entity, dict)
+        else None
+    )
+    if not isinstance(related_entities, list):
+        related_entities = payload.get("related_entities")
     if not isinstance(related_entities, list):
         return None, None
     for entry in related_entities:
diff --git a/tests/adapters/delivery_providers/cdek/test_order_info_client.py b/tests/adapters/delivery_providers/cdek/test_order_info_client.py
index f5c2107..8b08d26 100644
--- a/tests/adapters/delivery_providers/cdek/test_order_info_client.py
+++ b/tests/adapters/delivery_providers/cdek/test_order_info_client.py
@@ -64,10 +64,10 @@ def test_get_order_parses_status_and_waybill_uuid() -> None:
                 "statuses": [
                     {"code": "ACCEPTED", "date_time": "2026-05-24T10:00:00+0000"}
                 ],
+                "related_entities": [
+                    {"type": "waybill", "uuid": "waybill-uuid-1"}
+                ],
             },
-            "related_entities": [
-                {"type": "waybill", "uuid": "waybill-uuid-1"}
-            ],
         },
         request=httpx.Request("GET", "https://api.cdek.test/v2/orders/cdek-order-uuid"),
     )
diff --git a/tests/adapters/delivery_providers/cdek/test_order_mapper.py b/tests/adapters/delivery_providers/cdek/test_order_mapper.py
index 9a0c4ea..1bdc254 100644
--- a/tests/adapters/delivery_providers/cdek/test_order_mapper.py
+++ b/tests/adapters/delivery_providers/cdek/test_order_mapper.py
@@ -42,15 +42,17 @@ def test_map_cdek_order_response_extracts_order_uuid_without_waybill() -> None:
 def test_map_cdek_order_response_extracts_waybill_from_related_entities() -> None:
     result = map_cdek_order_response(
         {
-            "entity": {"uuid": "cdek-order-uuid"},
-            "related_entities": [
-                {"type": "delivery", "uuid": "ignored"},
-                {
-                    "type": "waybill",
-                    "uuid": "waybill-uuid-1",
-                    "url": "https://cdek.test/waybill/1.pdf",
-                },
-            ],
+            "entity": {
+                "uuid": "cdek-order-uuid",
+                "related_entities": [
+                    {"type": "delivery", "uuid": "ignored"},
+                    {
+                        "type": "waybill",
+                        "uuid": "waybill-uuid-1",
+                        "url": "https://cdek.test/waybill/1.pdf",
+                    },
+                ],
+            },
         }
     )
 
@@ -61,6 +63,26 @@ def test_map_cdek_order_response_extracts_waybill_from_related_entities() -> Non
     )
 
 
+def test_map_cdek_order_response_supports_root_related_entities() -> None:
+    result = map_cdek_order_response(
+        {
+            "entity": {"uuid": "cdek-order-uuid"},
+            "related_entities": [
+                {
+                    "type": "waybill",
+                    "uuid": "waybill-uuid-legacy",
+                },
+            ],
+        }
+    )
+
+    assert result == CDEKOrderRegistrationResult(
+        order_uuid="cdek-order-uuid",
+        waybill_uuid="waybill-uuid-legacy",
+        waybill_url=None,
+    )
+
+
 def test_map_cdek_existing_order_response_returns_waybill_for_duplicate() -> None:
     result = map_cdek_existing_order_response(
         {
@@ -224,10 +246,10 @@ def test_map_cdek_order_info_response_picks_latest_status_by_date_time() -> None
                     {"code": "ACCEPTED", "date_time": "2026-05-24T10:00:00+0000"},
                     {"code": "INVALID", "date_time": "2026-05-24T10:00:05+0000"},
                 ],
+                "related_entities": [
+                    {"type": "waybill", "uuid": "waybill-uuid-1"}
+                ],
             },
-            "related_entities": [
-                {"type": "waybill", "uuid": "waybill-uuid-1"}
-            ],
         }
     )