From be80cc916f4322cd6b1af61e22bdaa481faf7d4e Mon Sep 17 00:00:00 2001 From: FanouZeng-TT <18280587072@163.com> Date: Wed, 18 Nov 2026 21:45:54 +0800 Subject: [PATCH] fix: resolve shipping destination address fields on canonical keys --- shopping/base.py | 30 ++++++++++++++++++++---- shopping/checkout/lifecycle_test.py | 6 +++-- shopping/fulfillment/fulfillment_test.py | 9 ++++--- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/shopping/base.py b/shopping/base.py index df4c489..5f84cf6 100644 --- a/shopping/base.py +++ b/shopping/base.py @@ -183,6 +183,20 @@ def get_valid_payment_payload( } +def first_non_none(mapping: dict[str, Any], *keys: str) -> Any: + """Return the first value under keys that is neither null nor empty. + + Address fixtures spell the same field with the canonical UCP name + (`address_locality`), the legacy `locality`, or a plain `city`. A key that + is explicitly null must not shadow a later populated key. + """ + for key in keys: + value = mapping.get(key) + if value is not None and value != "": + return value + return None + + class AddressFixture(TypedDict, total=False): """A stored address fixture, keyed with response-schema field names.""" @@ -322,8 +336,12 @@ def get_test_destination(self) -> dict[str, Any]: } dest.setdefault("address_country", dest.get("country", "US")) dest.setdefault("postal_code", dest.get("postal_code", "94105")) - dest.setdefault("locality", dest.get("city", "San Francisco")) - dest.setdefault("region", dest.get("state", "CA")) + locality = first_non_none(dest, "address_locality", "locality", "city") + region = first_non_none(dest, "address_region", "region", "state") + dest["address_locality"] = ( + locality if locality is not None else "San Francisco" + ) + dest["address_region"] = region if region is not None else "CA" dest.setdefault("street_address", dest.get("street", "123 Market St")) return dest @@ -695,8 +713,12 @@ 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=first_non_none( + dest_data, "address_locality", "locality", "city" + ), + address_region=first_non_none( + dest_data, "address_region", "region", "state" + ), street_address=dest_data.get( "street_address", dest_data.get("street") ), diff --git a/shopping/checkout/lifecycle_test.py b/shopping/checkout/lifecycle_test.py index 9070b96..b0befca 100644 --- a/shopping/checkout/lifecycle_test.py +++ b/shopping/checkout/lifecycle_test.py @@ -143,8 +143,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", ) ) @@ -219,6 +219,8 @@ def test_update_checkout(self): ) self.assertEqual(selected_dest.get("postal_code"), "90210") self.assertEqual(selected_dest.get("street_address"), "456 Elm St") + self.assertEqual(selected_dest.get("address_locality"), "Beverly Hills") + self.assertEqual(selected_dest.get("address_region"), "CA") def test_cancel_checkout(self): """Test successful checkout cancellation. diff --git a/shopping/fulfillment/fulfillment_test.py b/shopping/fulfillment/fulfillment_test.py index 2939adf..ec3cba6 100644 --- a/shopping/fulfillment/fulfillment_test.py +++ b/shopping/fulfillment/fulfillment_test.py @@ -19,6 +19,7 @@ from absl.testing import absltest from framework.decorators import requires_capability from shopping.base import CustomerFixture +from shopping.base import first_non_none from shopping.base import shopping_test_data from shopping.base import ShoppingIntegrationTestBase from ucp_sdk.models.schemas.shopping import checkout as checkout @@ -117,10 +118,12 @@ def test_fulfillment_flow(self) -> None: street_address=dest_data.get( "street_address", dest_data.get("street", "123 Market St") ), - address_locality=dest_data.get( - "locality", dest_data.get("city", "San Francisco") + address_locality=first_non_none( + dest_data, "address_locality", "locality", "city" + ), + address_region=first_non_none( + dest_data, "address_region", "region", "state" ), - address_region=dest_data.get("region", dest_data.get("state", "CA")), postal_code=dest_data.get("postal_code", "94105"), address_country=dest_data.get( "address_country", dest_data.get("country", "US")