[WOOMOB-1516] - Booking attendance status #14778

AdamGrzybkowski · 2025-10-17T13:49:00Z

Description

This PR implements the attendance_status we get from the API. This value is now displayed and also update after selecting an option from the bottom sheet.

For the loading progress indicator, I've decided to use the SkeletonView (see the recording below).

Only the bookings created after installing the latest plugin will have the status set. The old one will have an empty string. I didn't handle this in any way as this should be an issue for us during the development phase. But if you think we should, let me know.

Steps to reproduce

Make sure to install the latest Booking plugin from trunk
Create some new bookings
Login to the app
Go to bookings tab
All the old bookings created before the plugin update will have an empty
New bookings (from step 2) should have the booked status shown
Open the booking
Tap on the attendance Status row
Select a new status
Verify the status was updated

Testing information

Test network connection issues and response errors.

The tests that have been performed

The above

Images/gif

Screen_recording_20251017_151920.mp4

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.

dangermattic · 2025-10-17T13:49:58Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

	1 Message
📖	This PR is still a Draft: some checks will be skipped.

Generated by 🚫 Danger

Copilot

Pull Request Overview

Implements booking attendance status end-to-end: persistence, mapping, network update, UI display, and update-in-progress skeleton states.

Adds attendanceStatus to BookingEntity with Room converters and DB auto-migration.
Maps API field attendance_status to domain/UI, exposes updateAttendanceStatus via repository/store/client.
Updates UI to display attendance status, handle update via bottom sheet, and show SkeletonView while updating.

Reviewed Changes

Copilot reviewed 21 out of 22 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/BookingEntity.kt	Adds AttendanceStatus sealed type, field on entity, and type converters.
libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCAndroidDatabase.kt	Bumps DB version and adds auto-migration for new column.
libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsRestClient.kt	Adds endpoint to update attendance status.
libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsStore.kt	Adds flow to call REST client, map DTO, and persist updated booking.
libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingDto.kt	Adds attendance_status field to DTO.
libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingDtoMapper.kt	Maps attendance_status to entity.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingsRepository.kt	Exposes updateAttendanceStatus to app layer.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt	Maps entity attendance to UI, threads update-in-progress state.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/*	Wires selection to repository, tracks AttendanceUpdateStatus, updates state.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/*	Renders attendance tag/section with Skeleton during updates; updates enums → sealed types.
WooCommerce/src/main/res/values/strings.xml	Adds error string for attendance status updates.
WooCommerce/src/test/*	Adjusts tests for new API and verifies update call.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-10-17T13:52:29Z

...ce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingAttendanceStatusTag.kt

+        BookingAttendanceStatus.CheckedIn -> stringResource(R.string.booking_attendance_status_checked_in)
+        BookingAttendanceStatus.Cancelled -> stringResource(R.string.booking_attendance_status_cancelled)
+        BookingAttendanceStatus.NoShow -> stringResource(R.string.booking_attendance_status_no_show)
+        is BookingAttendanceStatus.Unknown -> key


Unresolved reference 'key' in the Unknown branch; use the smart-cast receiver. Replace with 'this.key' so the code compiles.

Suggested change

is BookingAttendanceStatus.Unknown -> key

is BookingAttendanceStatus.Unknown -> this.key

Copilot · 2025-10-17T13:52:29Z

...ce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingAttendanceStatusTag.kt

+        when (attendanceUpdateStatus) {
+            AttendanceUpdateStatus.InProgress -> {
+                SkeletonView(
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(4.dp))
+                        .sizeIn(
+                            minHeight = 20.dp,
+                            maxWidth = 80.dp
+                        )
+                        .size(skeletonSize)
+                )
+            }
+
+            AttendanceUpdateStatus.Idle -> {
+                WCTag(
+                    text = state.text(),
+                    backgroundColor = state.backgroundColor(),
+                    textColor = colorResource(R.color.tagView_text),
+                    fontWeight = FontWeight.Normal,
+                    modifier = modifier
+                        .onSizeChanged {
+                            with(density) {
+                                skeletonSize = DpSize(it.width.toDp(), it.height.toDp())
+                            }
+                        }
+                )
+            }
+        }


The skeleton uses size(skeletonSize) without a minimum width; if the first render is InProgress, skeletonSize is 0.dp and nothing is shown. Add a minWidth fallback (e.g., via sizeIn(minWidth = 40.dp)) or use a default size when skeletonSize == DpSize.Zero. Also, the passed 'modifier' isn't applied to the skeleton path, which causes layout inconsistency during loading; apply 'modifier' to the outer container or skeleton as well.

Copilot · 2025-10-17T13:52:29Z

...erce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingAttendanceSection.kt

+            when (attendanceUpdateStatus) {
+                AttendanceUpdateStatus.InProgress -> {
+                    SkeletonView(
+                        modifier = Modifier
+                            .size(skeletonSize)
+                    )
+                }
+
+                AttendanceUpdateStatus.Idle -> {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier
+                            .onSizeChanged {
+                                with(density) {
+                                    skeletonSize = DpSize(it.width.toDp(), it.height.toDp())
+                                }
+                            }
+                    ) {
+                        Text(
+                            text = value,
+                            style = MaterialTheme.typography.labelLarge,


Skeleton uses size(skeletonSize) with no minimums; on first render in InProgress state, it will render at 0×0. Add a fallback size (e.g., sizeIn(minWidth = 80.dp, minHeight = 20.dp)) or conditionally use a default when skeletonSize == DpSize.Zero so loading is visible.

Copilot · 2025-10-17T13:52:30Z

...fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/BookingEntity.kt

+        companion object Companion {
+            fun fromKey(key: String): AttendanceStatus {
+                return when (key) {
+                    Booked.key -> Booked
+                    NoShow.key -> NoShow
+                    CheckedIn.key -> CheckedIn
+                    else -> Unknown(key)
+                }
+            }
+        }


[nitpick] Naming the companion object explicitly 'Companion' is redundant and unusual. Prefer 'companion object' without a name for clarity.

AdamGrzybkowski · 2025-10-17T13:51:46Z

.../src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsStore.kt

+                    val orderResult = bookingDto.orderId.takeIf { it != 0L }?.let {
+                        orderStore.fetchSingleOrderSync(site, bookingDto.orderId)
+                    }


Not sure if this is needed - asked here p1760707694187709/1760706907.922799-slack-CNA89KY6M

AdamGrzybkowski · 2025-10-17T13:52:53Z

...fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/BookingEntity.kt

    val parentId: Long,
    val personCounts: List<Long>?,
    val localTimezone: String,
+    @ColumnInfo(defaultValue = "") val attendanceStatus: AttendanceStatus,


Is this, as a default okay? All new bookings start with booked so we could do the same 🤔

AdamGrzybkowski · 2025-10-17T13:53:58Z

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

+        BookingEntity.AttendanceStatus.Booked -> BookingAttendanceStatus.Booked
+        BookingEntity.AttendanceStatus.CheckedIn -> BookingAttendanceStatus.CheckedIn
+        BookingEntity.AttendanceStatus.NoShow -> BookingAttendanceStatus.NoShow


As you can see, there's no Cancelled here - not sure yet how we will determine such attendance status.

wpmobilebot · 2025-10-17T13:59:30Z

📲 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	`dde00b5`
	Direct Download	`woocommerce-wear-prototype-build-pr14778-dde00b5.apk`

wpmobilebot · 2025-10-17T14:14:58Z

📲 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	`dde00b5`
	Direct Download	`woocommerce-prototype-build-pr14778-dde00b5.apk`

codecov-commenter · 2025-10-17T14:26:15Z

Codecov Report

❌ Patch coverage is 13.20755% with 184 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.05%. Comparing base (4ad858a) to head (dde00b5).
⚠️ Report is 22 commits behind head on trunk.

Files with missing lines	Patch %	Lines
.../ui/bookings/compose/BookingAttendanceStatusTag.kt	0.00%	47 Missing ⚠️
...id/ui/bookings/compose/BookingAttendanceSection.kt	0.00%	43 Missing ⚠️
...erce/android/ui/bookings/compose/BookingSummary.kt	4.54%	21 Missing ⚠️
...xc/network/rest/wpcom/wc/bookings/BookingsStore.kt	0.00%	21 Missing ⚠️
...oid/ui/bookings/details/BookingDetailsViewModel.kt	42.30%	6 Missing and 9 partials ⚠️
...ings/compose/BookingAttendanceStatusBottomSheet.kt	0.00%	10 Missing ⚠️
...twork/rest/wpcom/wc/bookings/BookingsRestClient.kt	0.00%	10 Missing ⚠️
...commerce/android/ui/bookings/BookingsRepository.kt	0.00%	8 Missing ⚠️
.../android/fluxc/persistence/entity/BookingEntity.kt	58.33%	2 Missing and 3 partials ⚠️
...m/woocommerce/android/ui/bookings/BookingMapper.kt	60.00%	3 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #14778      +/-   ##
============================================
- Coverage     38.08%   38.05%   -0.04%     
- Complexity     9998    10001       +3     
============================================
  Files          2119     2119              
  Lines        119170   119321     +151     
  Branches      16228    16273      +45     
============================================
+ Hits          45385    45402      +17     
- Misses        69206    69330     +124     
- Partials       4579     4589      +10

☔ 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 added 6 commits October 17, 2025 15:40

Add booking.attendance_status to the data layer

6f4456d

Show Booking attendance status in the UI

b4e25d2

PUT request to update attendance status

893bcb8

Update BookingDetailsViewModel logic&state for attendance status update

ceacf4f

Show Skeleton when updating attendance status

01c9678

Adjust BookingDetailsViewModelTest

dde00b5

AdamGrzybkowski added this to the 23.6 milestone Oct 17, 2025

AdamGrzybkowski requested a review from Copilot October 17, 2025 13:49

AdamGrzybkowski added Enhancement feature: CIAB Mobile Experience labels Oct 17, 2025

Copilot AI reviewed Oct 17, 2025

View reviewed changes

AdamGrzybkowski commented Oct 17, 2025

View reviewed changes

	is BookingAttendanceStatus.Unknown -> key
	is BookingAttendanceStatus.Unknown -> this.key

[WOOMOB-1516] - Booking attendance status #14778

Are you sure you want to change the base?

[WOOMOB-1516] - Booking attendance status #14778

Uh oh!

Conversation

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

Uh oh!

Description

Steps to reproduce

Testing information

The tests that have been performed

Images/gif

Uh oh!

dangermattic commented Oct 17, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

wpmobilebot commented Oct 17, 2025

Uh oh!

wpmobilebot commented Oct 17, 2025

Uh oh!

codecov-commenter commented Oct 17, 2025

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

AdamGrzybkowski commented Oct 17, 2025 •

edited

Loading