woocommerce · AdamGrzybkowski · Mar 11, 2026 · Mar 10, 2026 · Mar 10, 2026 · Mar 10, 2026
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -6,6 +6,7 @@
 -----
 
 - [Internal] Add full-text search for POS product search with analytics tracking [https://github.com/woocommerce/woocommerce-android/pull/15484]
+- [Internal] Fixed attendance status filter sending invalid API requests when multiple statuses were selected [https://github.com/woocommerce/woocommerce-android/pull/15504]
 
 24.3
 -----

diff --git a/...rce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListScreen.kt b/...rce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListScreen.kt
@@ -162,8 +162,8 @@ private fun FiltersNavHost(
         }
         composable(BookingFilterPage.AttendanceStatus.route) {
             BookingAttendanceStatusFilterRoute(
-                initialAttendanceStatuses = state.updatedBookingFilters.attendanceStatuses
-            ) { attendanceStatuses -> state.onUpdateFilterOption(attendanceStatuses) }
+                initialAttendanceStatus = state.updatedBookingFilters.attendanceStatus
+            ) { attendanceStatus -> state.onUpdateFilterOption(attendanceStatus) }
         }
         composable(BookingFilterPage.PaymentStatus.route) {
         }

diff --git a/...ce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListUiState.kt b/...ce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListUiState.kt
@@ -69,13 +69,7 @@ data class BookingFilterListUiState(
             }
 
             BookingFilterPage.AttendanceStatus -> {
-                updatedBookingFilters.attendanceStatuses.values.takeIf { it.isNotEmpty() }?.let { list ->
-                    if (list.size > 1) {
-                        UiString.UiStringText(list.size.toString())
-                    } else {
-                        UiString.UiStringRes(list.first().titleRes)
-                    }
-                }
+                updatedBookingFilters.attendanceStatus.value?.let { UiString.UiStringRes(it.titleRes) }
             }
 
             BookingFilterPage.Customer -> updatedBookingFilters.customer?.customerName?.let { name ->
@@ -151,7 +145,7 @@ fun BookingFilters.updateFilterOption(bookingsFilterOption: BookingsFilterOption
         is BookingsFilterOption.DateRange -> copy(dateRange = bookingsFilterOption)
         is BookingsFilterOption.Customer -> copy(customer = bookingsFilterOption)
         is BookingsFilterOption.TeamMembers -> copy(teamMembers = bookingsFilterOption)
-        is BookingsFilterOption.AttendanceStatuses -> copy(attendanceStatuses = bookingsFilterOption)
+        is BookingsFilterOption.AttendanceStatus -> copy(attendanceStatus = bookingsFilterOption)
         is BookingsFilterOption.PaymentStatus -> copy(paymentStatus = bookingsFilterOption)
         is BookingsFilterOption.BookingType -> copy(bookingType = bookingsFilterOption)
         is BookingsFilterOption.Location -> copy(location = bookingsFilterOption)

diff --git a/.../src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListViewModel.kt b/.../src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListViewModel.kt
@@ -151,7 +151,7 @@ class BookingFilterListViewModel @Inject constructor(
         if (teamMembers != BookingsFilterOption.TeamMembers.DEFAULT) add("team_member")
         if (bookingType?.value != null) add("booking_type")
         if (serviceEvents != BookingsFilterOption.ServiceEvents.DEFAULT) add("service_events")
-        if (attendanceStatuses != BookingsFilterOption.AttendanceStatuses.DEFAULT) add("attendance_status")
+        if (attendanceStatus != BookingsFilterOption.AttendanceStatus.DEFAULT) add("attendance_status")
         if (paymentStatus != null) add("payment_status")
         if (customer != null) add("customer")
         if (dateRange != BookingsFilterOption.DateRange.DEFAULT) add("date_time")

diff --git a/...commerce/android/ui/bookings/filter/attendancestatus/BookingAttendanceStatusFilterPage.kt b/...commerce/android/ui/bookings/filter/attendancestatus/BookingAttendanceStatusFilterPage.kt
@@ -9,13 +9,13 @@ import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilter
 
 @Composable
 fun BookingAttendanceStatusFilterRoute(
-    initialAttendanceStatuses: BookingsFilterOption.AttendanceStatuses?,
-    onAttendanceStatusesFilterChanged: (BookingsFilterOption.AttendanceStatuses) -> Unit,
+    initialAttendanceStatus: BookingsFilterOption.AttendanceStatus?,
+    onAttendanceStatusFilterChanged: (BookingsFilterOption.AttendanceStatus) -> Unit,
 ) {
     val viewModel =
         hiltViewModel<BookingAttendanceStatusFilterViewModel, BookingAttendanceStatusFilterViewModel.Factory>
         { factory ->
-            factory.create(initialAttendanceStatuses, onAttendanceStatusesFilterChanged)
+            factory.create(initialAttendanceStatus, onAttendanceStatusFilterChanged)
         }
     val uiState by viewModel.uiState.observeAsState()
     uiState?.let { BookingAttendanceStatusFilterPage(it) }

diff --git a/...merce/android/ui/bookings/filter/attendancestatus/BookingAttendanceStatusFilterUiState.kt b/...merce/android/ui/bookings/filter/attendancestatus/BookingAttendanceStatusFilterUiState.kt
@@ -4,11 +4,10 @@ import androidx.annotation.StringRes
 import com.woocommerce.android.R
 import com.woocommerce.android.model.UiString
 import com.woocommerce.android.ui.bookings.filter.BookingFilterListItem
-import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption.AttendanceStatuses
 import org.wordpress.android.fluxc.persistence.entity.BookingEntity.AttendanceStatus
 
 data class BookingAttendanceStatusFilterUiState(
-    val selectedStatuses: AttendanceStatuses = AttendanceStatuses.DEFAULT,
+    val selectedStatus: AttendanceStatus? = null,
     val onStatusSelected: (AttendanceStatus?) -> Unit = {},
 ) {
     val items: List<BookingFilterListItem> = availableAttendanceStatuses().map { status ->
@@ -26,9 +25,9 @@ data class BookingAttendanceStatusFilterUiState(
     )
 
     private fun isSelected(status: AttendanceStatus?): Boolean = if (status == AttendanceStatus.any) {
-        selectedStatuses.values.isEmpty()
+        selectedStatus == null
     } else {
-        selectedStatuses.values.contains(status)
+        selectedStatus == status
     }
 }
 

diff --git a/...rce/android/ui/bookings/filter/attendancestatus/BookingAttendanceStatusFilterViewModel.kt b/...rce/android/ui/bookings/filter/attendancestatus/BookingAttendanceStatusFilterViewModel.kt
@@ -10,46 +10,39 @@ import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
-import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption.AttendanceStatuses
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
 import org.wordpress.android.fluxc.persistence.entity.BookingEntity.AttendanceStatus
 
 @HiltViewModel(assistedFactory = BookingAttendanceStatusFilterViewModel.Factory::class)
 class BookingAttendanceStatusFilterViewModel @AssistedInject constructor(
-    @Assisted private val initialStatuses: AttendanceStatuses?,
-    @Assisted private val onFilterChanged: (AttendanceStatuses) -> Unit,
+    @Assisted private val initialStatus: BookingsFilterOption.AttendanceStatus?,
+    @Assisted private val onFilterChanged: (BookingsFilterOption.AttendanceStatus) -> Unit,
     savedStateHandle: SavedStateHandle,
 ) : ScopedViewModel(savedStateHandle) {
 
     private val _uiState = MutableStateFlow(
         BookingAttendanceStatusFilterUiState(
-            selectedStatuses = initialStatuses ?: AttendanceStatuses.DEFAULT,
+            selectedStatus = initialStatus?.value,
             onStatusSelected = ::onStatusSelected
         )
     )
     val uiState: LiveData<BookingAttendanceStatusFilterUiState> = _uiState.asLiveData()
 
     private fun onStatusSelected(status: AttendanceStatus?) {
-        val newSelectedStatusesState = if (status == AttendanceStatus.any) {
-            AttendanceStatuses.DEFAULT
-        } else {
-            val statusSet = _uiState.value.selectedStatuses.values.toMutableSet()
-            if (statusSet.contains(status)) {
-                statusSet.remove(status)
-            } else {
-                status?.let { statusSet.add(it) }
-            }
-            AttendanceStatuses(statusSet)
+        val newSelectedStatus = when {
+            status == AttendanceStatus.any -> null
+            else -> status
         }
 
-        _uiState.update { it.copy(selectedStatuses = newSelectedStatusesState) }
-        onFilterChanged(newSelectedStatusesState)
+        _uiState.update { it.copy(selectedStatus = newSelectedStatus) }
+        onFilterChanged(BookingsFilterOption.AttendanceStatus(newSelectedStatus))
     }
 
     @AssistedFactory
     interface Factory {
         fun create(
-            initial: AttendanceStatuses?,
-            onFilterChanged: (AttendanceStatuses) -> Unit
+            initial: BookingsFilterOption.AttendanceStatus?,
+            onFilterChanged: (BookingsFilterOption.AttendanceStatus) -> Unit
         ): BookingAttendanceStatusFilterViewModel
     }
 }
diff --git a/...rc/main/kotlin/com/woocommerce/android/ui/bookings/filter/data/BookingFilterRepository.kt b/...rc/main/kotlin/com/woocommerce/android/ui/bookings/filter/data/BookingFilterRepository.kt
@@ -29,7 +29,12 @@ class BookingFilterRepository @Inject constructor(
     // Keys are built per-site to keep selections isolated across sites
     private fun teamMembersKey(siteId: Int) = stringSetPreferencesKey("bfilters_${siteId}_team_members")
     private fun bookingTypeKey(siteId: Int) = stringPreferencesKey("bfilters_${siteId}_booking_type")
-    private fun attendanceStatusesKey(siteId: Int) = stringSetPreferencesKey("bfilters_${siteId}_attendance_statuses")
+    private fun attendanceStatusKey(siteId: Int) = stringPreferencesKey("bfilters_${siteId}_attendance_status")
+
+    @Deprecated("Legacy key for migration")
+    private fun legacyAttendanceStatusesKey(siteId: Int) =
+        stringSetPreferencesKey("bfilters_${siteId}_attendance_statuses")
+
     private fun customerIdKey(siteId: Int) = longPreferencesKey("bfilters_${siteId}_customer_id")
     private fun customerNameKey(siteId: Int) = stringPreferencesKey("bfilters_${siteId}_customer_name")
     private fun dateBeforeKey(siteId: Int) = longPreferencesKey("bfilters_${siteId}_date_before")
@@ -43,8 +48,7 @@ class BookingFilterRepository @Inject constructor(
             BookingFilters(
                 teamMembers = prefs.getTeamMembers(siteId) ?: BookingsFilterOption.TeamMembers.DEFAULT,
                 bookingType = prefs.getBookingType(siteId),
-                attendanceStatuses = prefs.getAttendanceStatuses(siteId)
-                    ?: BookingsFilterOption.AttendanceStatuses.DEFAULT,
+                attendanceStatus = prefs.getAttendanceStatus(siteId),
                 customer = prefs.getCustomerValue(siteId),
                 dateRange = prefs.getDateRangeValue(siteId),
                 serviceEvents = prefs.getServiceEventsValue(siteId)
@@ -56,7 +60,6 @@ class BookingFilterRepository @Inject constructor(
     suspend fun save(bookingFilters: BookingFilters) {
         val siteId = selectedSite.getSelectedSiteId()
         dataStore.edit { prefs ->
-            // Team member
             val teamMembersKey = teamMembersKey(siteId)
             val teamMembersValues = bookingFilters.teamMembers.values
             if (teamMembersValues.isEmpty()) {
@@ -65,34 +68,29 @@ class BookingFilterRepository @Inject constructor(
                 prefs[teamMembersKey] = teamMembersValues.map { it.value.toString() }.toSet()
             }
 
-            // Booking type
             val bookingTypeKey = bookingTypeKey(siteId)
             val bookingTypeValue = bookingFilters.bookingType?.value?.name
             if (bookingTypeValue != null) {
                 prefs[bookingTypeKey] = bookingTypeValue
             } else {
-                // Clear if not provided
                 prefs.remove(bookingTypeKey)
             }
 
-            // Attendance statuses
-            val attendanceStatusesKey = attendanceStatusesKey(siteId)
-            val attendanceStatusesValues = bookingFilters.attendanceStatuses.values
-            if (attendanceStatusesValues.isEmpty()) {
-                prefs.remove(attendanceStatusesKey)
+            val attendanceStatusValue = bookingFilters.attendanceStatus.value?.key
+            if (attendanceStatusValue != null) {
+                prefs[attendanceStatusKey(siteId)] = attendanceStatusValue
             } else {
-                prefs[attendanceStatusesKey] = attendanceStatusesValues.map { it.key }.toSet()
+                prefs.remove(attendanceStatusKey(siteId))
             }
+            @Suppress("DEPRECATION")
+            prefs.remove(legacyAttendanceStatusesKey(siteId))
 
-            // Customer
             val customerIdKey = customerIdKey(siteId)
             val customerNameKey = customerNameKey(siteId)
             val customer = bookingFilters.customer
             if (customer != null) {
-                val id = customer.customerId
-                val name = customer.customerName
-                prefs[customerIdKey] = id
-                prefs[customerNameKey] = name
+                prefs[customerIdKey] = customer.customerId
+                prefs[customerNameKey] = customer.customerName
             } else {
                 // Clear if not provided
                 prefs.remove(customerIdKey)
@@ -124,7 +122,6 @@ class BookingFilterRepository @Inject constructor(
                     .map { "${it.productId}${SERVICE_EVENTS_PRODUCT_DELIMITER}${it.productName}" }
                     .toSet()
             }
-            // Other filters currently have no persisted payload; ignore for now
         }
     }
 
@@ -141,12 +138,23 @@ class BookingFilterRepository @Inject constructor(
         return value?.let { BookingsFilterOption.BookingType(value = it) }
     }
 
-    private fun Preferences.getAttendanceStatuses(siteId: Int): BookingsFilterOption.AttendanceStatuses? {
-        val stored = this[attendanceStatusesKey(siteId)] ?: return null
-        val set = stored.mapNotNull { runCatching { BookingEntity.AttendanceStatus.fromKey(it) }.getOrNull() }
-            .filterNot { it is BookingEntity.AttendanceStatus.Unknown }
-            .toSet()
-        return BookingsFilterOption.AttendanceStatuses(set)
+    private fun Preferences.getAttendanceStatus(siteId: Int): BookingsFilterOption.AttendanceStatus {
+        val stored = this[attendanceStatusKey(siteId)]
+            ?: return migrateLegacyAttendanceStatus(siteId)
+        val status = runCatching { BookingEntity.AttendanceStatus.fromKey(stored) }.getOrNull()
+            ?.takeIf { it !is BookingEntity.AttendanceStatus.Unknown }
+        return BookingsFilterOption.AttendanceStatus(status)
+    }
+
+    @Suppress("DEPRECATION")
+    private fun Preferences.migrateLegacyAttendanceStatus(siteId: Int): BookingsFilterOption.AttendanceStatus {
+        val legacy = this[legacyAttendanceStatusesKey(siteId)]
+            ?: return BookingsFilterOption.AttendanceStatus.DEFAULT
+        val status = legacy.firstNotNullOfOrNull { key ->
+            runCatching { BookingEntity.AttendanceStatus.fromKey(key) }.getOrNull()
+                ?.takeIf { it !is BookingEntity.AttendanceStatus.Unknown }
+        }
+        return BookingsFilterOption.AttendanceStatus(status)
     }
 
     private fun Preferences.getCustomerValue(siteId: Int): BookingsFilterOption.Customer? {

diff --git a/.../test/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListViewModelTest.kt b/.../test/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListViewModelTest.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.SavedStateHandle
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
-import com.woocommerce.android.model.UiString
 import com.woocommerce.android.model.UiString.UiStringRes
 import com.woocommerce.android.ui.bookings.filter.data.BookingFilterRepository
 import com.woocommerce.android.util.getOrAwaitValue
@@ -221,7 +220,7 @@ class BookingFilterListViewModelTest : BaseUnitTest() {
         val onPage = viewModel.uiState.getOrAwaitValue()
 
         // Select one attendance status (Attended)
-        onPage.onUpdateFilterOption(BookingsFilterOption.AttendanceStatuses(values = setOf(AttendanceStatus.Attended)))
+        onPage.onUpdateFilterOption(BookingsFilterOption.AttendanceStatus(AttendanceStatus.Attended))
 
         // WHEN: leave the page (go back to root list)
         viewModel.uiState.getOrAwaitValue().onClose()
@@ -236,39 +235,12 @@ class BookingFilterListViewModelTest : BaseUnitTest() {
         assertThat(value).isEqualTo(R.string.booking_attendance_status_attended)
     }
 
-    @Test
-    fun `when two attendance statuses selected and leaving page, then root shows selected both statuses`() {
-        // GIVEN: navigate to Attendance Status page and select two statuses
-        val initial = viewModel.uiState.getOrAwaitValue()
-        initial.openPage(BookingFilterPage.AttendanceStatus)
-        val onPage = viewModel.uiState.getOrAwaitValue()
-
-        // Select two attendance statuses (Attended and Unattended)
-        onPage.onUpdateFilterOption(
-            BookingsFilterOption.AttendanceStatuses(
-                values = setOf(AttendanceStatus.Attended, AttendanceStatus.Unattended)
-            )
-        )
-
-        // WHEN: leave the page (go back to root list)
-        viewModel.uiState.getOrAwaitValue().onClose()
-
-        // THEN: root list shows both selected statuses in subtitle values (order agnostic)
-        val root = viewModel.uiState.getOrAwaitValue()
-
-        val attendanceItem =
-            root.items.first { (it.title as UiStringRes).stringRes == R.string.bookings_filter_title_attendance_status }
-        val value = (attendanceItem.value as UiString.UiStringText).text
-
-        assertThat(value).isEqualTo("2")
-    }
-
     @Test
     fun `when onShowBookings called with filters, then BOOKING_LIST_APPLY_FILTERS is tracked`() {
         val state = viewModel.uiState.getOrAwaitValue()
         state.onUpdateFilterOption(BookingType(BookingType.Type.SERVICE))
         state.onUpdateFilterOption(
-            BookingsFilterOption.AttendanceStatuses(values = setOf(AttendanceStatus.Attended))
+            BookingsFilterOption.AttendanceStatus(AttendanceStatus.Attended)
         )
 
         viewModel.uiState.getOrAwaitValue().onShowBookings()
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     -----
     - [Internal] Add full-text search for POS product search with analytics tracking [https://github.com/woocommerce/woocommerce-android/pull/15484]
+    - [Internal] Fixed attendance status filter sending invalid API requests when multiple statuses were selected [https://github.com/woocommerce/woocommerce-android/pull/15504]
 .3
     -----
@@ Expand Down @@