Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions shopping/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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")
),
Expand Down
6 changes: 4 additions & 2 deletions shopping/checkout/lifecycle_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)
)
Expand Down Expand Up @@ -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.
Expand Down
9 changes: 6 additions & 3 deletions shopping/fulfillment/fulfillment_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down
Loading