Merge pull request #14750 from woocommerce/issue/WOOMOB-1453_booking_details_refresh

[WOOMOB-1453] Booking details - refresh API call

Author: hichamboushaba

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

@@ -60,6 +60,20 @@ class BookingsRepository @Inject constructor(
             bookingId = bookingId
         )
 
+    suspend fun fetchBooking(
+        bookingId: Long
+    ): Result<Unit> {
+        val result = bookingsStore.fetchBooking(
+            site = selectedSite.get(),
+            bookingId = bookingId
+        )
+        return if (result.isError) {
+            Result.failure(WooException(result.error))
+        } else {
+            Result.success(Unit)
+        }
+    }
+
     data class FetchResult(
         val bookings: List<Booking>,
         val hasMorePages: Boolean

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

@@ -7,13 +7,19 @@ import android.view.ViewGroup
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.ui.base.BaseFragment
+import com.woocommerce.android.ui.base.UIMessageResolver
 import com.woocommerce.android.ui.compose.composeView
 import com.woocommerce.android.ui.main.AppBarStatus
+import com.woocommerce.android.viewmodel.MultiLiveEvent
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class BookingDetailsFragment : BaseFragment() {
 
+    @Inject
+    lateinit var uiMessageResolver: UIMessageResolver
+
     private val viewModel: BookingDetailsViewModel by viewModels()
 
     override val activityAppBarStatus: AppBarStatus
@@ -33,4 +39,19 @@ class BookingDetailsFragment : BaseFragment() {
             )
         }
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        handleEvents()
+    }
+
+    private fun handleEvents() {
+        viewModel.event.observe(viewLifecycleOwner) { event ->
+            when (event) {
+                is MultiLiveEvent.Event.ShowSnackbar -> {
+                    uiMessageResolver.showSnack(event.message)
+                }
+            }
+        }
+    }
 }

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

@@ -17,18 +17,16 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.times
-import com.woocommerce.android.R
 import com.woocommerce.android.ui.bookings.compose.BookingAppointmentDetails
 import com.woocommerce.android.ui.bookings.compose.BookingAppointmentDetailsModel
 import com.woocommerce.android.ui.bookings.compose.BookingAttendanceSection
@@ -43,6 +41,7 @@ import com.woocommerce.android.ui.bookings.compose.BookingSummary
 import com.woocommerce.android.ui.bookings.compose.BookingSummaryModel
 import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.component.Toolbar
+import com.woocommerce.android.ui.compose.component.WCPullToRefreshBox
 import com.woocommerce.android.ui.compose.preview.LightDarkThemePreviews
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 
@@ -64,6 +63,7 @@ fun BookingDetailsScreen(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BookingDetailsScreen(
     viewState: BookingDetailsViewState,
@@ -80,14 +80,17 @@ fun BookingDetailsScreen(
             )
         }
     ) { innerPadding ->
-        Surface(
-            color = colorResource(R.color.default_window_background),
-            modifier = Modifier.fillMaxSize()
+        WCPullToRefreshBox(
+            isRefreshing = viewState.loadingState == BookingDetailsLoadingState.Refreshing,
+            onRefresh = viewState.onRefresh,
+            state = rememberPullToRefreshState(),
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
         ) {
             Column(
                 modifier = Modifier
                     .verticalScroll(rememberScrollState())
-                    .padding(innerPadding)
             ) {
                 when {
                     viewState.shouldShowSkeleton -> BookingDetailsLoading()
@@ -102,14 +105,14 @@ fun BookingDetailsScreen(
                 }
             }
         }
-        if (showAttendanceSheet.value) {
-            BookingAttendanceStatusBottomSheet(
-                onSelect = { status ->
-                    viewState.onAttendanceStatusSelected(status)
-                },
-                onDismiss = { showAttendanceSheet.value = false }
-            )
-        }
+    }
+    if (showAttendanceSheet.value) {
+        BookingAttendanceStatusBottomSheet(
+            onSelect = { status ->
+                viewState.onAttendanceStatusSelected(status)
+            },
+            onDismiss = { showAttendanceSheet.value = false }
+        )
     }
 }
 

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

@@ -4,49 +4,77 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import com.woocommerce.android.R
+import com.woocommerce.android.tools.NetworkStatus
 import com.woocommerce.android.ui.bookings.Booking
 import com.woocommerce.android.ui.bookings.BookingMapper
 import com.woocommerce.android.ui.bookings.BookingsRepository
 import com.woocommerce.android.ui.bookings.compose.BookingAttendanceStatus
+import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ResourceProvider
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import com.woocommerce.android.viewmodel.navArgs
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class BookingDetailsViewModel @Inject constructor(
     savedState: SavedStateHandle,
-    resourceProvider: ResourceProvider,
-    bookingsRepository: BookingsRepository,
+    private val resourceProvider: ResourceProvider,
+    private val bookingsRepository: BookingsRepository,
     private val bookingMapper: BookingMapper,
+    private val networkStatus: NetworkStatus,
 ) : ScopedViewModel(savedState) {
 
     private val navArgs: BookingDetailsFragmentArgs by savedState.navArgs()
 
     private val booking = bookingsRepository.observeBooking(navArgs.bookingId)
 
+    private val loadingState = MutableStateFlow<BookingDetailsLoadingState>(BookingDetailsLoadingState.Idle)
+
     // Temporary, the booking status should come from the stored object
     private val bookingAttendanceStatus = MutableStateFlow<BookingAttendanceStatus?>(null)
 
     val state: LiveData<BookingDetailsViewState> = combine(
         booking,
-        bookingAttendanceStatus
-    ) { booking, attendanceStatus ->
+        bookingAttendanceStatus,
+        loadingState
+    ) { booking, attendanceStatus, loadingState ->
         with(bookingMapper) {
             BookingDetailsViewState(
                 toolbarTitle = booking?.id?.value?.let { id ->
                     resourceProvider.getString(R.string.booking_details_title, id)
                 } ?: "",
                 bookingUiState = if (booking != null) buildBookingUiState(booking, attendanceStatus) else null,
+                loadingState = loadingState,
                 onCancelBooking = ::onCancelBooking,
-                onAttendanceStatusSelected = ::onAttendanceStatusSelected
+                onAttendanceStatusSelected = ::onAttendanceStatusSelected,
+                onRefresh = ::fetchBooking,
             )
         }
     }.asLiveData()
 
+    init {
+        fetchBooking(BookingDetailsLoadingState.Loading)
+    }
+
+    private fun fetchBooking(state: BookingDetailsLoadingState = BookingDetailsLoadingState.Refreshing) {
+        launch {
+            if (!networkStatus.isConnected()) {
+                triggerEvent(MultiLiveEvent.Event.ShowSnackbar(R.string.offline_error))
+                return@launch
+            }
+            loadingState.value = state
+            bookingsRepository.fetchBooking(navArgs.bookingId)
+                .onFailure {
+                    triggerEvent(MultiLiveEvent.Event.ShowSnackbar(R.string.bookings_fetch_error))
+                }
+            loadingState.value = BookingDetailsLoadingState.Idle
+        }
+    }
+
     private fun onAttendanceStatusSelected(status: BookingAttendanceStatus) {
         // Temporary, the booking status should come from the stored object
         bookingAttendanceStatus.value = status

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

@@ -6,14 +6,21 @@ import com.woocommerce.android.ui.bookings.compose.BookingCustomerDetailsModel
 import com.woocommerce.android.ui.bookings.compose.BookingPaymentDetailsModel
 import com.woocommerce.android.ui.bookings.compose.BookingSummaryModel
 
+sealed interface BookingDetailsLoadingState {
+    data object Idle : BookingDetailsLoadingState
+    data object Loading : BookingDetailsLoadingState
+    data object Refreshing : BookingDetailsLoadingState
+}
+
 data class BookingDetailsViewState(
     val toolbarTitle: String = "",
     val bookingUiState: BookingUiState? = null,
+    val loadingState: BookingDetailsLoadingState = BookingDetailsLoadingState.Idle,
     val onCancelBooking: () -> Unit = {},
-    val onAttendanceStatusSelected: (BookingAttendanceStatus) -> Unit = { _ -> }
+    val onAttendanceStatusSelected: (BookingAttendanceStatus) -> Unit = { _ -> },
+    val onRefresh: () -> Unit = {},
 ) {
-
-    val shouldShowSkeleton: Boolean = bookingUiState == null
+    val shouldShowSkeleton: Boolean = bookingUiState == null && loadingState == BookingDetailsLoadingState.Refreshing
 }
 
 data class BookingUiState(

WooCommerce/src/main/res/values/strings.xml

@@ -4233,6 +4233,8 @@
     <string name="booking_payment_label_service">Service</string>
     <string name="booking_payment_mark_as_paid">Mark as paid</string>
     <string name="booking_payment_view_order">View order</string>
+    <string name="booking_fetch_error">Error fetching booking</string>
+
     <string name="or_use_password" a8c-src-lib="module:login">Use password to sign in</string>
     <string name="about_automattic_main_page_title">About %1$s</string>
     <string name="about_automattic_legal_page_title">Legal and More</string>