Use the BookingMapper in the BookingListViewModel

Author: AdamGrzybkowski

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

@@ -4,6 +4,7 @@ import com.woocommerce.android.ui.bookings.compose.BookingAppointmentDetailsMode
 import com.woocommerce.android.ui.bookings.compose.BookingAttendanceStatus
 import com.woocommerce.android.ui.bookings.compose.BookingStatus
 import com.woocommerce.android.ui.bookings.compose.BookingSummaryModel
+import com.woocommerce.android.ui.bookings.list.BookingListItem
 import com.woocommerce.android.util.CurrencyFormatter
 import org.wordpress.android.fluxc.persistence.entity.BookingEntity
 import java.time.Duration
@@ -36,6 +37,13 @@ class BookingMapper @Inject constructor(
         )
     }
 
+    fun Booking.toUiModel(): BookingListItem {
+        return BookingListItem(
+            id = id.value,
+            summary = toBookingSummaryModel()
+        )
+    }
+
     fun Booking.toAppointmentDetailsModel(): BookingAppointmentDetailsModel {
         val durationMinutes = Duration.between(start, end).toMinutes()
         return BookingAppointmentDetailsModel(

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

@@ -4,6 +4,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.woocommerce.android.R
+import com.woocommerce.android.ui.bookings.BookingMapper
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import com.woocommerce.android.viewmodel.getStateFlow
@@ -21,7 +22,8 @@ import javax.inject.Inject
 class BookingListViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val bookingListHandler: BookingListHandler,
-    private val filtersBuilder: BookingListFiltersBuilder
+    private val filtersBuilder: BookingListFiltersBuilder,
+    private val bookingMapper: BookingMapper,
 ) : ScopedViewModel(savedStateHandle) {
     private val loadingState = MutableStateFlow(BookingListLoadingState.Idle)
     private val selectedTab = savedStateHandle.getStateFlow(viewModelScope, BookingListTab.Today)
@@ -30,7 +32,9 @@ class BookingListViewModel @Inject constructor(
     private var bookingsLoadMoreJob: Job? = null
 
     private val contentState = combine(
-        bookingListHandler.bookingsFlow.map { bookings -> bookings.map { it.toUiModel() } },
+        bookingListHandler.bookingsFlow.map { bookings ->
+            with(bookingMapper) { bookings.map { it.toUiModel() } }
+        },
         loadingState
     ) { bookings, loadingState ->
         BookingListContentState(

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

@@ -1,13 +1,6 @@
 package com.woocommerce.android.ui.bookings.list
 
-import com.woocommerce.android.ui.bookings.Booking
-import com.woocommerce.android.ui.bookings.compose.BookingAttendanceStatus
-import com.woocommerce.android.ui.bookings.compose.BookingStatus
 import com.woocommerce.android.ui.bookings.compose.BookingSummaryModel
-import org.wordpress.android.fluxc.persistence.entity.BookingEntity
-import java.time.ZoneId
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
 
 data class BookingListViewState(
     val contentState: BookingListContentState,
@@ -41,32 +34,3 @@ enum class BookingListLoadingState {
 enum class BookingListTab {
     Today, Upcoming, All
 }
-
-fun Booking.toUiModel(): BookingListItem {
-    val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(
-        FormatStyle.MEDIUM,
-        FormatStyle.SHORT
-    ).withZone(ZoneId.systemDefault())
-
-    // TODO replace the mocked details with real data when available from the API
-    return BookingListItem(
-        id = id.value,
-        summary = BookingSummaryModel(
-            date = dateFormatter.format(start),
-            name = "Women’s Haircut",
-            customerName = "Margarita Nikolaevna",
-            attendanceStatus = BookingAttendanceStatus.BOOKED,
-            status = status.toUiModel()
-        )
-    )
-}
-
-private fun BookingEntity.Status.toUiModel(): BookingStatus = when (this) {
-    BookingEntity.Status.Paid -> BookingStatus.Paid
-    BookingEntity.Status.PendingConfirmation -> BookingStatus.PendingConfirmation
-    BookingEntity.Status.Cancelled -> BookingStatus.Cancelled
-    BookingEntity.Status.Complete -> BookingStatus.Complete
-    BookingEntity.Status.Confirmed -> BookingStatus.Confirmed
-    BookingEntity.Status.Unpaid -> BookingStatus.Unpaid
-    is BookingEntity.Status.Unknown -> BookingStatus.Unknown(this.key)
-}

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/bookings/list/BookingListViewModelTest.kt

@@ -3,6 +3,8 @@ package com.woocommerce.android.ui.bookings.list
 import androidx.lifecycle.SavedStateHandle
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.bookings.Booking
+import com.woocommerce.android.ui.bookings.BookingMapper
+import com.woocommerce.android.util.CurrencyFormatter
 import com.woocommerce.android.util.captureValues
 import com.woocommerce.android.util.getOrAwaitValue
 import com.woocommerce.android.viewmodel.BaseUnitTest
@@ -42,6 +44,8 @@ class BookingListViewModelTest : BaseUnitTest() {
     }
     private val mockedNow = Instant.parse("2025-01-01T12:00:00Z")
     private val filtersBuilder = BookingListFiltersBuilder(Clock.fixed(mockedNow, ZoneId.of("UTC")))
+    private val currencyFormatter = mock<CurrencyFormatter>()
+    private val bookingMapper = BookingMapper(currencyFormatter)
 
     private lateinit var viewModel: BookingListViewModel
 
@@ -54,7 +58,8 @@ class BookingListViewModelTest : BaseUnitTest() {
         viewModel = BookingListViewModel(
             savedStateHandle = SavedStateHandle(),
             bookingListHandler = bookingListHandler,
-            filtersBuilder = filtersBuilder
+            filtersBuilder = filtersBuilder,
+            bookingMapper = bookingMapper,
         )
     }