From 33fc7a15bca069f91554b36b0754fa97e62c1e26 Mon Sep 17 00:00:00 2001
From: FanouZeng-TT <18280587072@163.com>
Date: Mon, 24 Aug 2026 18:10:34 +0800
Subject: [PATCH 1/2] fix: use canonical shipping destination address fields

---
 checkout_lifecycle_test.py | 4 ++--
 integration_test_utils.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/checkout_lifecycle_test.py b/checkout_lifecycle_test.py
index 44bba18..25275b9 100644
--- a/checkout_lifecycle_test.py
+++ b/checkout_lifecycle_test.py
@@ -130,8 +130,8 @@ def test_update_checkout(self):
       id="dest_2",
       address_country="US",
       postal_code="90210",
-      locality="Beverly Hills",
-      region="CA",
+      address_locality="Beverly Hills",
+      address_region="CA",
       street_address="456 Elm St",
     )
 
diff --git a/integration_test_utils.py b/integration_test_utils.py
index 826a018..aa32288 100644
--- a/integration_test_utils.py
+++ b/integration_test_utils.py
@@ -895,8 +895,8 @@ def create_checkout_payload(
           "address_country", dest_data.get("country", "US")
         ),
         postal_code=dest_data.get("postal_code", "94105"),
-        locality=dest_data.get("locality", dest_data.get("city")),
-        region=dest_data.get("region", dest_data.get("state")),
+        address_locality=dest_data.get("locality", dest_data.get("city")),
+        address_region=dest_data.get("region", dest_data.get("state")),
         street_address=dest_data.get("street_address", dest_data.get("street")),
       )
       group = fulfillment_group_create_request.FulfillmentGroupCreateRequest(

From 213395f5c8dfc5df11576d75962bf6b37ed25637 Mon Sep 17 00:00:00 2001
From: FanouZeng-TT <18280587072@163.com>
Date: Tue, 25 Aug 2026 02:11:44 +0800
Subject: [PATCH 2/2] fix: use request shipping destination models

---
 checkout_lifecycle_test.py | 20 ++++++++++++--------
 integration_test_utils.py  | 26 ++++++++++++++++----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/checkout_lifecycle_test.py b/checkout_lifecycle_test.py
index 25275b9..d5ddf01 100644
--- a/checkout_lifecycle_test.py
+++ b/checkout_lifecycle_test.py
@@ -33,7 +33,9 @@
 )
 from ucp_sdk.models.schemas.shopping.types import item_update_request
 from ucp_sdk.models.schemas.shopping.types import line_item_update_request
-from ucp_sdk.models.schemas.shopping.types import shipping_destination
+from ucp_sdk.models.schemas.shopping.types import (
+  shipping_destination_update_request,
+)
 
 # Rebuild models to resolve forward references
 checkout.Checkout.model_rebuild(_types_namespace={"Payment": Payment})
@@ -126,13 +128,15 @@ def test_update_checkout(self):
       phone_number="+15555555556",
     )
 
-    new_destination = shipping_destination.ShippingDestination(
-      id="dest_2",
-      address_country="US",
-      postal_code="90210",
-      address_locality="Beverly Hills",
-      address_region="CA",
-      street_address="456 Elm St",
+    new_destination = (
+      shipping_destination_update_request.ShippingDestinationUpdateRequest(
+        id="dest_2",
+        address_country="US",
+        postal_code="90210",
+        address_locality="Beverly Hills",
+        address_region="CA",
+        street_address="456 Elm St",
+      )
     )
 
     existing_method = checkout_obj.fulfillment["methods"][0]
diff --git a/integration_test_utils.py b/integration_test_utils.py
index aa32288..0d0375b 100644
--- a/integration_test_utils.py
+++ b/integration_test_utils.py
@@ -48,7 +48,9 @@
 from ucp_sdk.models.schemas.shopping.types import line_item_create_request
 from ucp_sdk.models.schemas.shopping.types import line_item_update_request
 from ucp_sdk.models.schemas import payment_handler
-from ucp_sdk.models.schemas.shopping.types import shipping_destination
+from ucp_sdk.models.schemas.shopping.types import (
+  shipping_destination_create_request,
+)
 import uvicorn
 
 
@@ -889,15 +891,19 @@ def create_checkout_payload(
     if include_fulfillment:
       # Hierarchical Fulfillment Construction using dynamic destination
       dest_data = ctx.get_test_destination()
-      destination = shipping_destination.ShippingDestination(
-        id="dest_1",
-        address_country=dest_data.get(
-          "address_country", dest_data.get("country", "US")
-        ),
-        postal_code=dest_data.get("postal_code", "94105"),
-        address_locality=dest_data.get("locality", dest_data.get("city")),
-        address_region=dest_data.get("region", dest_data.get("state")),
-        street_address=dest_data.get("street_address", dest_data.get("street")),
+      destination = (
+        shipping_destination_create_request.ShippingDestinationCreateRequest(
+          id="dest_1",
+          address_country=dest_data.get(
+            "address_country", dest_data.get("country", "US")
+          ),
+          postal_code=dest_data.get("postal_code", "94105"),
+          address_locality=dest_data.get("locality", dest_data.get("city")),
+          address_region=dest_data.get("region", dest_data.get("state")),
+          street_address=dest_data.get(
+            "street_address", dest_data.get("street")
+          ),
+        )
       )
       group = fulfillment_group_create_request.FulfillmentGroupCreateRequest(
         id="group_1",