[CIAB] Implement mapping of payment details for Bookings and improve address formatting #14746

hichamboushaba · 2025-10-13T17:09:02Z

Closes WOOMOB-1503

Description

This PR adds two main changes:

Implements the mapping from the BookingPaymentInfo to the UI model BookingPaymentDetailsModel. For this change I made the property bookingPaymentDetails nullable in BookingUiState, because if we don't have an order, it will be null, a case that we handle in the DB even though it shouldn't happen in production.
Improve address formatting to match what we use in other areas in the app, to do so I choose to use the existing Address model as an intermediary for the formatting.

I'll leave some comments regarding some decisions below.

Steps to reproduce

Enable taxes calculation for your store.
Create a booking with an order.
Open the order in wp-admin, and apply a discount (either using a coupon, or by manually modifying the price of the booking in the details screen)
Open the booking in the app.

Testing information

Confirm the address formatting matches what we use in order details.
Confirm the payment details are shown correctly.

The tests that have been performed

The above.

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

hichamboushaba · 2025-10-13T17:11:25Z

WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt

        } ?: this.orderAddressToString()
    }

-    fun getFullAddress(name: String, address: String, country: String): String {


I opted to remove this function, I don't know the history about it, but the fact that the function accepted the details made it look like a utility function that don't belong here in the model.
So instead, I updated the function not to require any arguments, which simplified its usage everywhere. For better context about the change, check the commit f383c32 individually.

hichamboushaba · 2025-10-13T17:13:24Z

...mmerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingCustomerDetails.kt

    val email: String?,
    val phone: String?,
-    val billingAddressLines: List<String>,
+    val billingAddress: String?,


I updated this to be a single String over a list, I did this because the existing API for Address formatting returns a single String, so instead of splitting it, we show it in a single Text. If you see any downsides with this change, please let me know.

hichamboushaba · 2025-10-13T17:16:45Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt

+        val (country, state) = withContext(Dispatchers.IO) {
+            getLocations(countryCode, billingState.orEmpty())
+        }


As we discussed before, this follows what we use in OrderMapper. If we want to avoid doing this in the mapper (personally don't see an issue with having this in the mapper), we'll have to do something like the following patch to move the getLocations call to the consumer, let me know if you prefer the other approach.

Subject: [PATCH] Changes --- Index: WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt (revision 6fb8c209cfc832aeb9f9445bff7415af171deafb) +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt (date 1760374703373) @@ -2,7 +2,9 @@ import com.woocommerce.android.extensions.isNotEqualTo import com.woocommerce.android.model.Address +import com.woocommerce.android.model.AmbiguousLocation import com.woocommerce.android.model.GetLocations +import com.woocommerce.android.model.Location import com.woocommerce.android.ui.bookings.compose.BookingAppointmentDetailsModel import com.woocommerce.android.ui.bookings.compose.BookingAttendanceStatus import com.woocommerce.android.ui.bookings.compose.BookingCustomerDetailsModel @@ -11,8 +13,6 @@ import com.woocommerce.android.ui.bookings.compose.BookingSummaryModel import com.woocommerce.android.ui.bookings.list.BookingListItem import com.woocommerce.android.util.CurrencyFormatter -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingCustomerInfo import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingPaymentInfo import org.wordpress.android.fluxc.persistence.entity.BookingEntity @@ -67,14 +67,17 @@ ) } - suspend fun BookingCustomerInfo?.toCustomerDetailsModel(): BookingCustomerDetailsModel { + fun BookingCustomerInfo?.toCustomerDetailsModel( + state: AmbiguousLocation?, + country: Location? + ): BookingCustomerDetailsModel { if (this == null) return BookingCustomerDetailsModel.EMPTY return BookingCustomerDetailsModel( name = fullName(), email = billingEmail, phone = billingPhone, - billingAddress = address()?.getFullAddress() + billingAddress = address(state, country)?.getFullAddress() ) } @@ -106,18 +109,19 @@ return "${billingFirstName.orEmpty()} ${billingLastName.orEmpty()}".trim().ifEmpty { null } } - private suspend fun BookingCustomerInfo.address(): Address? { - val countryCode = billingCountry ?: return null - val (country, state) = withContext(Dispatchers.IO) { - getLocations(countryCode, billingState.orEmpty()) - } + private fun BookingCustomerInfo.address( + state: AmbiguousLocation?, + country: Location? + ): Address? { + if (country == null) return null + return Address( company = billingCompany.orEmpty(), firstName = billingFirstName.orEmpty(), lastName = billingLastName.orEmpty(), phone = billingPhone.orEmpty(), country = country, - state = state, + state = state ?: AmbiguousLocation.Defined(Location.EMPTY), address1 = billingAddress1.orEmpty(), address2 = billingAddress2.orEmpty(), city = billingCity.orEmpty(), Index: WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModel.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModel.kt --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModel.kt (revision 6fb8c209cfc832aeb9f9445bff7415af171deafb) +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModel.kt (date 1760374630741) @@ -4,6 +4,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.asLiveData import com.woocommerce.android.R +import com.woocommerce.android.model.GetLocations import com.woocommerce.android.ui.bookings.Booking import com.woocommerce.android.ui.bookings.BookingMapper import com.woocommerce.android.ui.bookings.BookingsRepository @@ -23,6 +24,7 @@ resourceProvider: ResourceProvider, bookingsRepository: BookingsRepository, private val bookingMapper: BookingMapper, + private val getLocations: GetLocations ) : ScopedViewModel(savedState) { private val navArgs: BookingDetailsFragmentArgs by savedState.navArgs() @@ -59,16 +61,22 @@ private suspend fun BookingMapper.buildBookingUiState( booking: Booking, attendanceStatus: BookingAttendanceStatus? - ): BookingUiState = BookingUiState( - bookingSummary = booking.toBookingSummaryModel().let { - if (attendanceStatus != null) { - it.copy(attendanceStatus = attendanceStatus) - } else { - it - } - }, - bookingsAppointmentDetails = booking.toAppointmentDetailsModel(), - bookingCustomerDetails = booking.order.customerInfo.toCustomerDetailsModel(), - bookingPaymentDetails = booking.order.paymentInfo?.toPaymentDetailsModel(booking.currency) - ) + ): BookingUiState { + val (country, state) = booking.order.customerInfo?.let { + getLocations(it.billingCountry.orEmpty(), it.billingState.orEmpty()) + } ?: Pair(null, null) + + return BookingUiState( + bookingSummary = booking.toBookingSummaryModel().let { + if (attendanceStatus != null) { + it.copy(attendanceStatus = attendanceStatus) + } else { + it + } + }, + bookingsAppointmentDetails = booking.toAppointmentDetailsModel(), + bookingCustomerDetails = booking.order.customerInfo.toCustomerDetailsModel(state, country), + bookingPaymentDetails = booking.order.paymentInfo?.toPaymentDetailsModel(booking.currency) + ) + } }

Thanks for the explanation @hichamboushaba - my preference would be to go with the patch, especially considering the thread switching within the mapper. I won't block the PR, though.

Thanks Adam, after all, I decided to stick with what I have now, the nullability handling when moving getLocations call to the ViewModel is not easy to follow, and given we follow the same approach in OrderMapper, we stay consistent too.

hichamboushaba · 2025-10-13T17:18:00Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt

+        val discount = total - subtotal
+        return BookingPaymentDetailsModel(
+            service = currencyFormatter.formatCurrency(subtotal, currency), // Pre-discount subtotal
+            tax = currencyFormatter.formatCurrency(totalTax, currency), // Tax on total after discount
+            discount = if (discount.isNotEqualTo(BigDecimal.ZERO)) {
+                "- ${currencyFormatter.formatCurrency(discount.abs(), currency)}"
+            } else {
+                "-"
+            },
+            total = currencyFormatter.formatCurrency(total + totalTax, currency) // Total including tax


Let me know if you have any questions about the mapping here, I can share details on the role of the fields in the API and how Core handles the calculations.

wpmobilebot · 2025-10-13T17:19:08Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`6d76166`
	Direct Download	`woocommerce-wear-prototype-build-pr14746-6d76166.apk`

wpmobilebot · 2025-10-13T17:31:02Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`6d76166`
	Direct Download	`woocommerce-prototype-build-pr14746-6d76166.apk`

codecov-commenter · 2025-10-13T23:42:17Z

Codecov Report

❌ Patch coverage is 27.65957% with 34 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.36%. Comparing base (bb99aa2) to head (6d76166).
⚠️ Report is 46 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...m/woocommerce/android/ui/bookings/BookingMapper.kt	36.00%	16 Missing ⚠️
...roid/ui/bookings/compose/BookingCustomerDetails.kt	22.22%	7 Missing ⚠️
...in/kotlin/com/woocommerce/android/model/Address.kt	0.00%	6 Missing ⚠️
...woocommerce/android/model/CustomerWithAnalytics.kt	0.00%	2 Missing ⚠️
...main/kotlin/com/woocommerce/android/model/Order.kt	0.00%	2 Missing ⚠️
...oid/ui/bookings/details/BookingDetailsViewModel.kt	50.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              trunk   #14746   +/-   ##
=========================================
  Coverage     38.36%   38.36%           
- Complexity    10002    10004    +2     
=========================================
  Files          2115     2115           
  Lines        118023   118014    -9     
  Branches      15749    15758    +9     
=========================================
+ Hits          45274    45280    +6     
+ Misses        68550    68535   -15     
  Partials       4199     4199

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

AdamGrzybkowski

Looks good! The biiling adress matches the Order screen. There's one thing though - there seems to be a missing \n between city and country.

booking	order	web

Technically, this is not related to this PR so ✅ but I imagine this is a simple fix so maybe you could add it?

AdamGrzybkowski · 2025-10-14T09:00:35Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt

+        val (country, state) = withContext(Dispatchers.IO) {
+            getLocations(countryCode, billingState.orEmpty())
+        }


Thanks for the explanation @hichamboushaba - my preference would be to go with the patch, especially considering the thread switching within the mapper. I won't block the PR, though.

# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsScreen.kt

hichamboushaba · 2025-10-14T10:18:53Z

There's one thing though - there seems to be a missing \n between city and country.

Good eye, I'm not sure how I missed this. And this is a result of this PR, so it's good that we caught this, I didn't know appendWithIfNotEmpty adds the separator first and not after, fixed in the commit 35ce78e

Update address formatting for bookings to use the Address model

e80bcbb

hichamboushaba added Enhancement feature: CIAB Mobile Bookings MVP labels Oct 13, 2025

hichamboushaba commented Oct 13, 2025

View reviewed changes

hichamboushaba added 6 commits October 13, 2025 18:11

Simplify order address formatting

f383c32

Add some space between address section title and content

53bc023

Remove redundant suppress declaration

3a3c5a4

Handle mapping of payment details

dfa4499

Make sure GetLocations is invoked in IO thread

9a26ca2

Add unit tests

d152d74

hichamboushaba force-pushed the issue/WOOMOB-1503-mapping-from-orders branch from a44014b to d152d74 Compare October 13, 2025 17:12

hichamboushaba commented Oct 13, 2025

View reviewed changes

hichamboushaba requested a review from AdamGrzybkowski October 13, 2025 17:18

hichamboushaba marked this pull request as ready for review October 13, 2025 17:18

hichamboushaba added this to the 23.5 milestone Oct 13, 2025

AdamGrzybkowski self-assigned this Oct 14, 2025

AdamGrzybkowski approved these changes Oct 14, 2025

View reviewed changes

hichamboushaba added 2 commits October 14, 2025 10:51

Make sure to add a line separator before the country name

35ce78e

Merge branch 'trunk' into issue/WOOMOB-1503-mapping-from-orders

6d76166

# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsScreen.kt

hichamboushaba enabled auto-merge October 14, 2025 10:20

hichamboushaba merged commit a4105ff into trunk Oct 14, 2025
14 of 16 checks passed

hichamboushaba deleted the issue/WOOMOB-1503-mapping-from-orders branch October 14, 2025 10:50

[CIAB] Implement mapping of payment details for Bookings and improve address formatting #14746

[CIAB] Implement mapping of payment details for Bookings and improve address formatting #14746

Uh oh!

Conversation

hichamboushaba commented Oct 13, 2025

Description

Steps to reproduce

Testing information

The tests that have been performed

Uh oh!

hichamboushaba Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hichamboushaba Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

hichamboushaba Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

hichamboushaba Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

hichamboushaba Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

wpmobilebot commented Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

AdamGrzybkowski left a comment

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

hichamboushaba commented Oct 14, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hichamboushaba Oct 13, 2025 •

edited

Loading

wpmobilebot commented Oct 13, 2025 •

edited

Loading

wpmobilebot commented Oct 13, 2025 •

edited

Loading

codecov-commenter commented Oct 13, 2025 •

edited

Loading