[Bookings] Update type filter logic

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

@@ -1,12 +1,14 @@
 package com.woocommerce.android.ui.bookings.filter
 
 import androidx.annotation.StringRes
+import com.woocommerce.android.model.UiString
 
 /**
  * UI model simple filter item
  */
 data class BookingFilterListItem(
     @StringRes val title: Int,
-    val value: String? = null,
+    val subtitle: UiString? = null,
+    val selected: Boolean = false,
     val onClick: () -> Unit = {}
 )

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

@@ -3,6 +3,8 @@ package com.woocommerce.android.ui.bookings.filter
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.woocommerce.android.R
+import com.woocommerce.android.model.UiString
+import com.woocommerce.android.ui.bookings.filter.type.titleRes
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingFilters
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
 
@@ -31,34 +33,39 @@ data class BookingFilterListUiState(
     val items: List<BookingFilterListItem> = availableBookingFilters().map { page ->
         BookingFilterListItem(
             title = page.titleRes,
-            value = page.filterValue,
+            subtitle = page.filterValue,
             onClick = { openPage(page) },
         )
     }
 
     val currentBookingType: BookingsFilterOption.BookingType
         get() = newBookingFilters.getOrDefault<BookingsFilterOption.BookingType>(
             initialBookingFilters?.bookingType
-        ) ?: BookingsFilterOption.BookingType.Any
+        ) ?: BookingsFilterOption.BookingType(BookingsFilterOption.BookingType.Type.ANY)
 
     @DrawableRes
     val navigationIcon: Int = when (currentPage) {
         BookingFilterPage.List -> R.drawable.ic_gridicons_cross_24dp
         else -> R.drawable.ic_back_24dp
     }
 
-    val BookingFilterPage.filterValue: String?
+    val BookingFilterPage.filterValue: UiString?
         get() = when (this) {
             BookingFilterPage.Customer -> {
                 newBookingFilters.getOrDefault<BookingsFilterOption.Customer>(
                     initialBookingFilters?.customer
-                )?.customerName
+                )?.customerName?.let { name -> UiString.UiStringText(name) }
+            }
+
+            BookingFilterPage.BookingType -> {
+                newBookingFilters.getOrDefault<BookingsFilterOption.BookingType>(
+                    initialBookingFilters?.bookingType
+                )?.titleRes?.let { res -> UiString.UiStringRes(res) }
             }
 
             BookingFilterPage.DateTime,
             BookingFilterPage.Location,
             BookingFilterPage.AttendanceStatus,
-            BookingFilterPage.BookingType,
             BookingFilterPage.PaymentStatus,
             BookingFilterPage.ServiceEvent,
             BookingFilterPage.TeamMember,

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

@@ -42,15 +42,8 @@ class BookingFilterListViewModel @Inject constructor(
 
     private fun onUpdateFilterOption(option: BookingsFilterOption) {
         _uiState.update { current ->
-            val filtered = when (option) {
-                is BookingsFilterOption.BookingType -> {
-                    current.newBookingFilters.filterNot { it is BookingsFilterOption.BookingType }
-                }
-
-                else -> current.newBookingFilters.filterNot { it::class == option::class }
-            }
             current.copy(
-                newBookingFilters = filtered
+                newBookingFilters = current.newBookingFilters.filterNot { it::class == option::class }
                     .plus(option)
                     .toSet()
             )

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

@@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.compose.component.WCListItemWithInlineSubtitle
+import com.woocommerce.android.ui.compose.component.getText
 
 @Composable
 fun BookingFilterRootPage(
@@ -34,7 +35,7 @@ private fun BookingFilterListRow(item: BookingFilterListItem) {
     Column(modifier = Modifier.fillMaxWidth()) {
         WCListItemWithInlineSubtitle(
             text = stringResource(item.title),
-            subtitle = item.value ?: stringResource(id = R.string.bookings_filter_default),
+            subtitle = item.subtitle?.getText() ?: stringResource(id = R.string.bookings_filter_default),
             modifier = Modifier
                 .defaultMinSize(minHeight = 64.dp)
                 .clickable { item.onClick() }

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

@@ -25,14 +25,13 @@ import com.woocommerce.android.R
 @Composable
 fun SingleChoiceFilterPage(
     items: List<BookingFilterListItem>,
-    selectedValue: String?,
     modifier: Modifier = Modifier,
 ) {
     LazyColumn(modifier = modifier) {
         items(items) { item ->
             SingleChoiceRow(
                 text = stringResource(item.title),
-                selected = item.value == selectedValue,
+                selected = item.selected,
                 onClick = { item.onClick() }
             )
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/data/BookingFilterRepository.kt

@@ -24,6 +24,7 @@ class BookingFilterRepository @Inject constructor(
     private val selectedSite: SelectedSite,
 ) {
     // Keys are built per-site to keep selections isolated across sites
+    private fun bookingTypeKey(siteId: Int) = stringPreferencesKey("bfilters_${siteId}_booking_type")
     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")
@@ -34,6 +35,7 @@ class BookingFilterRepository @Inject constructor(
     val bookingFiltersFlow: Flow<BookingFilters> = siteIdFlow.flatMapLatest { siteId ->
         dataStore.data.map { prefs ->
             BookingFilters(
+                bookingType = prefs.getBookingType(siteId),
                 customer = prefs.getCustomerValue(siteId),
                 dateRange = prefs.getDateRangeValue(siteId)
             )
@@ -43,6 +45,16 @@ class BookingFilterRepository @Inject constructor(
     suspend fun save(bookingFilters: BookingFilters) {
         val siteId = selectedSite.getSelectedSiteId()
         dataStore.edit { prefs ->
+            // Booking type
+            val bookingTypeKey = bookingTypeKey(siteId)
+            val bookingType = bookingFilters.bookingType
+            if (bookingType != null) {
+                prefs[bookingTypeKey] = bookingType.value.name
+            } else {
+                // Clear if not provided
+                prefs.remove(bookingTypeKey)
+            }
+
             // Customer
             val customerIdKey = customerIdKey(siteId)
             val customerNameKey = customerNameKey(siteId)
@@ -77,6 +89,12 @@ class BookingFilterRepository @Inject constructor(
         }
     }
 
+    private fun Preferences.getBookingType(siteId: Int): BookingsFilterOption.BookingType? {
+        val stored = this[bookingTypeKey(siteId)] ?: return null
+        val type = runCatching { BookingsFilterOption.BookingType.Type.valueOf(stored) }.getOrNull()
+        return type?.let { BookingsFilterOption.BookingType(value = it) }
+    }
+
     private fun Preferences.getCustomerValue(siteId: Int): BookingsFilterOption.Customer? {
         val customerId = this[customerIdKey(siteId)]
         val customerName = this[customerNameKey(siteId)]

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/type/BookingTypeFilterPage.kt

@@ -22,8 +22,5 @@ fun BookingTypeFilterRoute(
 
 @Composable
 fun BookingTypeFilterPage(state: BookingTypeFilterUiState) {
-    SingleChoiceFilterPage(
-        items = state.items,
-        selectedValue = state.selectedType.filterValue,
-    )
+    SingleChoiceFilterPage(items = state.items)
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/type/BookingTypeFilterUiState.kt

@@ -6,35 +6,27 @@ import com.woocommerce.android.ui.bookings.filter.BookingFilterListItem
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption.BookingType
 
 data class BookingTypeFilterUiState(
-    val selectedType: BookingType = BookingType.Any,
+    val selectedType: BookingType = BookingType(BookingType.Type.ANY),
     val onTypeSelected: (BookingType) -> Unit = {},
 ) {
     val items: List<BookingFilterListItem> = availableBookingTypes().map { type ->
         BookingFilterListItem(
             title = type.titleRes,
-            value = type.filterValue,
+            selected = type == selectedType,
             onClick = { onTypeSelected(type) }
         )
     }
 
-    val BookingType.titleRes: Int
-        @StringRes get() = when (this) {
-            BookingType.Any -> R.string.bookings_filter_default
-            BookingType.Service -> R.string.bookings_filter_type_service
-            BookingType.Event -> R.string.bookings_filter_type_event
-        }
-
     private fun availableBookingTypes(): List<BookingType> = listOf(
-        BookingType.Any,
-        BookingType.Service,
-        BookingType.Event,
+        BookingType(BookingType.Type.ANY),
+        BookingType(BookingType.Type.SERVICE),
+        BookingType(BookingType.Type.EVENT),
     )
 }
 
-val BookingType.filterValue: String?
-    // TODO Update this with actual endpoint values
-    get() = when (this) {
-        BookingType.Service -> "service"
-        BookingType.Event -> "event"
-        BookingType.Any -> null
+val BookingType.titleRes: Int
+    @StringRes get() = when (this.value) {
+        BookingType.Type.ANY -> R.string.bookings_filter_default
+        BookingType.Type.SERVICE -> R.string.bookings_filter_type_service
+        BookingType.Type.EVENT -> R.string.bookings_filter_type_event
     }

libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsFilterOption.kt

@@ -9,10 +9,8 @@ sealed interface BookingsFilterOption {
 
     object PaymentStatus : BookingsFilterOption
 
-    sealed interface BookingType : BookingsFilterOption {
-        object Any : BookingType
-        object Service : BookingType
-        object Event : BookingType
+    data class BookingType(val value: Type) : BookingsFilterOption {
+        enum class Type { ANY, SERVICE, EVENT }
     }
 
     data class Customer(val customerId: Long, val customerName: String) : BookingsFilterOption
@@ -45,7 +43,7 @@ data class BookingFilters(
             if (teamMember != null) count++
             if (attendanceStatus != null) count++
             if (paymentStatus != null) count++
-            if (bookingType != null) count++
+            if (bookingType != null && bookingType.value != BookingsFilterOption.BookingType.Type.ANY) count++
             if (location != null) count++
             if (serviceEvent != null) count++
             return count

libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsRestClient.kt

@@ -109,7 +109,10 @@ class BookingsRestClient @Inject constructor(
                 BookingsFilterOption.TeamMember -> TODO()
                 BookingsFilterOption.AttendanceStatus -> TODO()
                 BookingsFilterOption.PaymentStatus -> TODO()
-                is BookingsFilterOption.BookingType -> TODO()
+                is BookingsFilterOption.BookingType -> {
+                    // TODO add query for booking type filtering
+                }
+
                 is BookingsFilterOption.Customer -> set("customer", filter.customerId.toString())
 
                 BookingsFilterOption.Location -> TODO()