Move onAttendanceStatusSelected to BookingDetailsViewState

Author: AdamGrzybkowski

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

@@ -46,7 +46,6 @@ fun BookingDetailsScreen(
         BookingDetailsScreen(
             viewState = it,
             onBack = onBack,
-            onAttendanceStatusSelected = viewModel::onAttendanceStatusSelected,
             onViewOrder = onViewOrder,
         )
     }
@@ -56,7 +55,6 @@ fun BookingDetailsScreen(
 fun BookingDetailsScreen(
     viewState: BookingDetailsViewState,
     onBack: () -> Unit,
-    onAttendanceStatusSelected: (AttendanceStatus) -> Unit,
     onViewOrder: (Long) -> Unit,
 ) {
     val showAttendanceSheet = remember { mutableStateOf(false) }
@@ -110,7 +108,7 @@ fun BookingDetailsScreen(
             if (showAttendanceSheet.value) {
                 BookingAttendanceStatusBottomSheet(
                     onSelect = { status ->
-                        onAttendanceStatusSelected(status)
+                        viewState.onAttendanceStatusSelected(status)
                     },
                     onDismiss = { showAttendanceSheet.value = false }
                 )
@@ -143,7 +141,6 @@ private fun BookingDetailsPreview() {
                 )
             ),
             onBack = {},
-            onAttendanceStatusSelected = {},
             onViewOrder = {}
         )
     }

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

@@ -27,6 +27,7 @@ class BookingDetailsViewModel @Inject constructor(
             onMarkAsPaid = ::onMarkAsPaid,
             onMarkAsRefunded = ::onMarkAsRefunded,
             onCancelBooking = ::onCancelBooking,
+            onAttendanceStatusSelected = ::onAttendanceStatusSelected,
         )
     )
     val state: LiveData<BookingDetailsViewState> = _state.asLiveData()
@@ -39,7 +40,7 @@ class BookingDetailsViewModel @Inject constructor(
         }
     }
 
-    fun onAttendanceStatusSelected(status: AttendanceStatus) {
+    private fun onAttendanceStatusSelected(status: AttendanceStatus) {
         _state.update { current ->
             current.copy(
                 bookingSummary = current.bookingSummary.copy(attendanceStatus = status)

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

@@ -44,4 +44,5 @@ data class BookingDetailsViewState(
     val onMarkAsPaid: () -> Unit = {},
     val onMarkAsRefunded: () -> Unit = {},
     val onCancelBooking: () -> Unit = {},
+    val onAttendanceStatusSelected: (AttendanceStatus) -> Unit = { _ -> }
 )

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModelTest.kt

@@ -2,6 +2,7 @@ package com.woocommerce.android.ui.bookings.details
 
 import androidx.lifecycle.SavedStateHandle
 import com.woocommerce.android.R
+import com.woocommerce.android.util.getOrAwaitValue
 import com.woocommerce.android.viewmodel.BaseUnitTest
 import com.woocommerce.android.viewmodel.ResourceProvider
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -41,7 +42,8 @@ class BookingDetailsViewModelTest : BaseUnitTest() {
         val viewModel = createViewModel(savedState, resourceProvider)
 
         // When
-        viewModel.onAttendanceStatusSelected(com.woocommerce.android.ui.bookings.compose.AttendanceStatus.CANCELLED)
+        val state = viewModel.state.getOrAwaitValue()
+        state.onAttendanceStatusSelected(com.woocommerce.android.ui.bookings.compose.AttendanceStatus.CANCELLED)
 
         // Then
         val updated = viewModel.state.value?.bookingSummary?.attendanceStatus