diff --git a/app/src/main/java/com/android/polybazaar/booking/model/Booking.kt b/app/src/main/java/com/android/polybazaar/booking/model/Booking.kt index beba52a0..1ed61ac2 100644 --- a/app/src/main/java/com/android/polybazaar/booking/model/Booking.kt +++ b/app/src/main/java/com/android/polybazaar/booking/model/Booking.kt @@ -30,3 +30,6 @@ data class Booking( val status: BookingStatus = BookingStatus.REQUESTED, val id: String = "", ) + +/** Whether every day is before [today]: the booking is history and stays as it is. */ +fun Booking.isFinished(today: LocalDate): Boolean = days.all { it.isBefore(today) } diff --git a/app/src/main/java/com/android/polybazaar/booking/ui/BookingListScreens.kt b/app/src/main/java/com/android/polybazaar/booking/ui/BookingListScreens.kt new file mode 100644 index 00000000..041be57c --- /dev/null +++ b/app/src/main/java/com/android/polybazaar/booking/ui/BookingListScreens.kt @@ -0,0 +1,272 @@ +// Co-authored-by: Copilot (Auto) +package com.android.polybazaar.booking.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.android.polybazaar.R +import com.android.polybazaar.auth.ui.AuthBackButton +import com.android.polybazaar.auth.ui.AuthColors +import com.android.polybazaar.booking.model.Booking +import com.android.polybazaar.booking.model.BookingStatus +import com.android.polybazaar.booking.model.formatRuns +import com.android.polybazaar.booking.model.groupIntoRuns +import com.android.polybazaar.booking.model.isFinished +import com.android.polybazaar.booking.viewmodel.BookingUiState +import com.android.polybazaar.booking.viewmodel.BookingViewModel +import com.android.polybazaar.error.ui.message +import java.time.LocalDate + +object BookingListScreenTags { + const val SCREEN = "booking_list_screen" + const val BACK_BUTTON = "booking_list_back_button" + const val LOADING_INDICATOR = "booking_list_loading_indicator" + const val ERROR_MESSAGE = "booking_list_error_message" + const val RETRY_BUTTON = "booking_list_retry_button" + const val EMPTY = "booking_list_empty" + const val STATUS = "booking_list_status" + const val CANCEL_BUTTON = "booking_list_cancel_button" + const val CANCELLING = "booking_list_cancelling" + const val LABEL = "booking_list_label" +} + +/** The renter's own bookings, loaded by [viewModel], each cancellable while still active. */ +@Composable +fun RenterBookingsScreen(viewModel: BookingViewModel, onBack: () -> Unit) { + val uiState by viewModel.uiState.collectAsState() + LaunchedEffect(viewModel) { viewModel.loadRenterBookings() } + BookingListContent( + title = stringResource(R.string.renter_bookings_title), + uiState = uiState, + onBack = onBack, + onRetry = viewModel::loadRenterBookings, + onCancel = viewModel::cancelBooking, + ) +} + +/** The bookings of [listingId] as its lender sees them, each cancellable while still active. */ +@Composable +fun LenderBookingsScreen(listingId: String, viewModel: BookingViewModel, onBack: () -> Unit) { + val uiState by viewModel.uiState.collectAsState() + LaunchedEffect(viewModel, listingId) { viewModel.loadListingBookings(listingId) } + BookingListContent( + title = stringResource(R.string.lender_bookings_title), + uiState = uiState, + onBack = onBack, + onRetry = { viewModel.loadListingBookings(listingId) }, + onCancel = viewModel::cancelBooking, + showRenter = true, + ) +} + +/** + * Loading, error with Retry, empty and list states of bookings. A cancelled booking stays listed as + * cancelled; a booking whose cancellation is being queued shows "Cancelling…". An error from a + * cancellation the server rejected shows above the list, which keeps the restored booking; its + * Retry cancels that booking again instead of reloading. A booking whose days are all before + * [today] is history and cannot be cancelled. + * + * @param showRenter names each booking after its renter (the lender's view) instead of its listing. + */ +@Composable +fun BookingListContent( + title: String, + uiState: BookingUiState, + onBack: () -> Unit, + onRetry: () -> Unit, + onCancel: (String) -> Unit, + showRenter: Boolean = false, + today: LocalDate = LocalDate.now(), +) { + Column( + modifier = + Modifier.fillMaxSize() + .background(AuthColors.Background) + .safeDrawingPadding() + .testTag(BookingListScreenTags.SCREEN) + ) { + AuthBackButton( + onClick = onBack, + modifier = + Modifier.padding(start = 20.dp, top = 6.dp).testTag(BookingListScreenTags.BACK_BUTTON), + ) + Text( + text = title, + color = AuthColors.TextPrimary, + fontSize = 24.sp, + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(horizontal = 18.dp, vertical = 12.dp), + ) + val error = uiState.error + if (error != null) { + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 18.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = error.message(), + color = AuthColors.Danger, + fontSize = 14.sp, + modifier = Modifier.weight(1f).testTag(BookingListScreenTags.ERROR_MESSAGE), + ) + TextButton( + onClick = { uiState.failedCancelId?.let(onCancel) ?: onRetry() }, + modifier = Modifier.testTag(BookingListScreenTags.RETRY_BUTTON), + ) { + Text( + text = stringResource(R.string.booking_request_retry), + color = AuthColors.Accent, + fontWeight = FontWeight.Bold, + ) + } + } + } + when { + uiState.isLoadingBookings && uiState.bookings.isEmpty() -> + Box(Modifier.fillMaxWidth().padding(24.dp), contentAlignment = Alignment.Center) { + CircularProgressIndicator( + color = AuthColors.Accent, + modifier = Modifier.size(32.dp).testTag(BookingListScreenTags.LOADING_INDICATOR), + ) + } + uiState.bookings.isEmpty() && error == null -> + Text( + text = stringResource(R.string.bookings_empty), + color = AuthColors.TextSecondary, + fontSize = 14.sp, + modifier = Modifier.padding(horizontal = 18.dp).testTag(BookingListScreenTags.EMPTY), + ) + else -> + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = androidx.compose.foundation.layout.PaddingValues(18.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + items(uiState.bookings, key = { it.id }) { booking -> + BookingRow( + booking = booking, + label = + if (showRenter) uiState.renterNames[booking.renterUid] + else uiState.listingTitles[booking.listingId], + isCancelling = booking.id in uiState.cancellingBookingIds, + canCancel = + booking.status != BookingStatus.CANCELLED && !booking.isFinished(today), + onCancel = { onCancel(booking.id) }, + ) + } + } + } + } +} + +@Composable +private fun BookingRow( + booking: Booking, + label: String?, + isCancelling: Boolean, + canCancel: Boolean, + onCancel: () -> Unit, +) { + Row( + modifier = Modifier.fillMaxWidth().background(AuthColors.CardBackground).padding(14.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(modifier = Modifier.weight(1f)) { + if (label != null) { + Text( + text = label, + color = AuthColors.TextPrimary, + fontWeight = FontWeight.Bold, + fontSize = 15.sp, + modifier = Modifier.testTag(BookingListScreenTags.LABEL), + ) + } + Text( + text = formatRuns(groupIntoRuns(booking.days)), + color = AuthColors.TextPrimary, + fontWeight = if (label == null) FontWeight.Bold else FontWeight.Normal, + fontSize = if (label == null) 15.sp else 13.sp, + ) + Text( + text = stringResource(booking.status.labelRes), + color = + if (booking.status == BookingStatus.CANCELLED) AuthColors.Danger + else AuthColors.TextSecondary, + fontSize = 13.sp, + modifier = Modifier.testTag(BookingListScreenTags.STATUS), + ) + } + when { + isCancelling -> + Text( + text = stringResource(R.string.bookings_cancelling), + color = AuthColors.TextSecondary, + fontSize = 13.sp, + modifier = Modifier.testTag(BookingListScreenTags.CANCELLING), + ) + canCancel -> + TextButton( + onClick = onCancel, + modifier = Modifier.testTag(BookingListScreenTags.CANCEL_BUTTON), + ) { + Text( + text = stringResource(R.string.bookings_cancel), + color = AuthColors.Danger, + fontWeight = FontWeight.Bold, + ) + } + } + } +} + +private val BookingStatus.labelRes: Int + get() = + when (this) { + BookingStatus.REQUESTED -> R.string.bookings_status_requested + BookingStatus.CONFIRMED -> R.string.bookings_status_confirmed + BookingStatus.CANCELLED -> R.string.bookings_status_cancelled + } + +/** Three bookings, one being cancelled, for the IDE preview. */ +@Preview(showBackground = true, widthDp = 412, heightDp = 917) +@Composable +private fun BookingListContentPreview() { + fun day(d: Int) = LocalDate.of(2026, 11, d) + val bookings = + listOf( + Booking("l", "renter", "lender", setOf(day(13), day(14), day(15)), id = "a"), + Booking("l", "renter", "lender", setOf(day(28)), BookingStatus.CONFIRMED, id = "b"), + Booking("l", "renter", "lender", setOf(day(2)), BookingStatus.CANCELLED, id = "c"), + ) + BookingListContent( + title = "My bookings", + uiState = BookingUiState(bookings = bookings, cancellingBookingIds = setOf("a")), + onBack = {}, + onRetry = {}, + onCancel = {}, + ) +} diff --git a/app/src/main/java/com/android/polybazaar/booking/viewmodel/BookingViewModel.kt b/app/src/main/java/com/android/polybazaar/booking/viewmodel/BookingViewModel.kt index 61e08406..229d38ae 100644 --- a/app/src/main/java/com/android/polybazaar/booking/viewmodel/BookingViewModel.kt +++ b/app/src/main/java/com/android/polybazaar/booking/viewmodel/BookingViewModel.kt @@ -9,10 +9,14 @@ import com.android.polybazaar.booking.model.BookingRepository import com.android.polybazaar.booking.model.BookingStatus import com.android.polybazaar.error.model.AppError import com.android.polybazaar.error.model.toAppError +import com.android.polybazaar.listing.model.ListingRepository +import com.android.polybazaar.profile.model.ProfileRepository +import java.time.LocalDate import kotlinx.coroutines.CancellationException import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch @@ -23,11 +27,27 @@ data class BookingUiState( val bookings: List = emptyList(), val isLoadingBookings: Boolean = false, val cancellingBookingIds: Set = emptySet(), + /** The booking whose cancellation the server refused or that failed, so Retry can redo it. */ + val failedCancelId: String? = null, + /** + * Titles of the booked listings by listing id, filled in once read; a missing one is unknown. + */ + val listingTitles: Map = emptyMap(), + /** Usernames of the renters by uid, filled in once read; a missing one is unknown. */ + val renterNames: Map = emptyMap(), val error: AppError? = null, ) -/** Submits a booking request through [bookingRepository]. */ -class BookingViewModel(private val bookingRepository: BookingRepository) : ViewModel() { +/** + * Submits a booking request through [bookingRepository] and lists bookings. [listingRepository] and + * [profileRepository] only name the bookings (listing titles for a renter, renter usernames for a + * lender); when a name cannot be read, the booking is listed without it. + */ +class BookingViewModel( + private val bookingRepository: BookingRepository, + private val listingRepository: ListingRepository? = null, + private val profileRepository: ProfileRepository? = null, +) : ViewModel() { private val _uiState = MutableStateFlow(BookingUiState()) val uiState: StateFlow = _uiState.asStateFlow() @@ -59,14 +79,33 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM } } - /** Loads bookings made by the signed-in renter. */ - fun loadRenterBookings() { + /** Loads bookings made by the signed-in renter, with the titles of their listings. */ + fun loadRenterBookings() = + loadBookings( + load = { bookingRepository.getBookingsForRenter() }, + name = { bookings -> nameListings(bookings) }, + ) + + /** Loads the bookings of [listingId] for the signed-in lender, with their renters' names. */ + fun loadListingBookings(listingId: String) = + loadBookings( + load = { bookingRepository.getBookingsForListing(listingId) }, + name = { bookings -> nameRenters(bookings) }, + ) + + private fun loadBookings( + load: suspend () -> List, + name: suspend (List) -> Unit, + ) { if (_uiState.value.isLoadingBookings) return - _uiState.update { it.copy(isLoadingBookings = true, error = null) } + _uiState.update { it.copy(isLoadingBookings = true, failedCancelId = null, error = null) } viewModelScope.launch { try { - val bookings = bookingRepository.getBookingsForRenter() + // Earliest first; the ID only keeps the order stable between bookings of the same day. + val bookings = + load().sortedWith(compareBy({ it.days.minOrNull() ?: LocalDate.MAX }, { it.id })) _uiState.update { it.copy(bookings = bookings, isLoadingBookings = false) } + name(bookings) } catch (exception: Exception) { if (exception is CancellationException) { _uiState.update { it.copy(isLoadingBookings = false) } @@ -77,9 +116,38 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM } } + private suspend fun nameListings(bookings: List) { + val repository = listingRepository ?: return + val titles = mutableMapOf() + for (listingId in bookings.map { it.listingId }.distinct()) { + readOrNull { repository.getListing(listingId).getOrNull() } + ?.let { titles[listingId] = it.title } + } + _uiState.update { it.copy(listingTitles = it.listingTitles + titles) } + } + + private suspend fun nameRenters(bookings: List) { + val repository = profileRepository ?: return + val names = mutableMapOf() + for (uid in bookings.map { it.renterUid }.distinct()) { + readOrNull { repository.observeProfile(uid).first() }?.let { names[uid] = it.username } + } + _uiState.update { it.copy(renterNames = it.renterNames + names) } + } + + /** A failed read is no error to show: the booking is simply listed without the name. */ + private suspend fun readOrNull(read: suspend () -> T?): T? = + try { + read() + } catch (exception: Exception) { + if (exception is CancellationException) throw exception + null + } + /** * Queues a cancellation and shows the booking as cancelled at once, also offline. If the server - * later rejects the write, the booking returns to its previous status and the error is exposed. + * later rejects the write, the booking returns to its previous status and the error is exposed, + * with the booking in [BookingUiState.failedCancelId] so that the cancellation can be retried. * [BookingUiState.cancellingBookingIds] holds the booking only until the write is queued. */ fun cancelBooking(id: String) { @@ -87,7 +155,13 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM if (id in _uiState.value.cancellingBookingIds || previousStatus == BookingStatus.CANCELLED) { return } - _uiState.update { it.copy(cancellingBookingIds = it.cancellingBookingIds + id, error = null) } + _uiState.update { + it.copy( + cancellingBookingIds = it.cancellingBookingIds + id, + failedCancelId = null, + error = null, + ) + } viewModelScope.launch { var rejected = false try { @@ -97,6 +171,7 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM it.copy( bookings = it.bookings.withStatus(id, previousStatus), cancellingBookingIds = it.cancellingBookingIds - id, + failedCancelId = id, error = exception.toAppError(), ) } @@ -112,7 +187,7 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM } catch (exception: Exception) { _uiState.update { it.copy(cancellingBookingIds = it.cancellingBookingIds - id) } if (exception is CancellationException) throw exception - _uiState.update { it.copy(error = exception.toAppError()) } + _uiState.update { it.copy(failedCancelId = id, error = exception.toAppError()) } } } } diff --git a/app/src/main/java/com/android/polybazaar/listing/ui/ListingDetailScreen.kt b/app/src/main/java/com/android/polybazaar/listing/ui/ListingDetailScreen.kt index 4e5e11b5..fab94f12 100644 --- a/app/src/main/java/com/android/polybazaar/listing/ui/ListingDetailScreen.kt +++ b/app/src/main/java/com/android/polybazaar/listing/ui/ListingDetailScreen.kt @@ -1,4 +1,5 @@ // Co-authored-by: Claude Code (Claude Opus 5.5) +// Co-authored-by: Copilot (Auto) package com.android.polybazaar.listing.ui import androidx.annotation.DrawableRes @@ -107,6 +108,7 @@ object ListingDetailScreenTags { const val PAUSED_BADGE = "listing_detail_paused_badge" const val PAUSED_NOTICE = "listing_detail_paused_notice" const val OWNER_ACTION_ERROR = "listing_detail_owner_action_error" + const val BOOKING_REQUESTS_BUTTON = "listing_detail_booking_requests_button" } /** @@ -114,6 +116,7 @@ object ListingDetailScreenTags { * not here: they stay inside the screen, so [ListingDetailScreen] wires them to the ViewModel. * * @property onEdit opens the "Edit listing" screen for the listing with this id (owner only). + * @property onOpenBookings opens the booking requests of the listing with this id (owner only). * @property onDeleted leaves the screen once the owner deleted the listing. */ class ListingDetailActions( @@ -122,6 +125,7 @@ class ListingDetailActions( val onMessageLender: () -> Unit = {}, val onChooseDates: () -> Unit = {}, val onEdit: (String) -> Unit = {}, + val onOpenBookings: (String) -> Unit = {}, val onDeleted: () -> Unit = {}, ) @@ -608,6 +612,20 @@ private fun BookingBar( ) } } + val ownedListingId = listing.listingId + if (uiState.isOwner && ownedListingId != null) { + TextButton( + onClick = { actions.onOpenBookings(ownedListingId) }, + modifier = + Modifier.fillMaxWidth().testTag(ListingDetailScreenTags.BOOKING_REQUESTS_BUTTON), + ) { + Text( + text = stringResource(R.string.lender_bookings_title), + color = AuthColors.Accent, + fontWeight = FontWeight.Bold, + ) + } + } uiState.ownerActionError?.let { SecondaryText( text = it.message(), diff --git a/app/src/main/java/com/android/polybazaar/profile/ui/ProfileScreen.kt b/app/src/main/java/com/android/polybazaar/profile/ui/ProfileScreen.kt index 89907272..7e626be7 100644 --- a/app/src/main/java/com/android/polybazaar/profile/ui/ProfileScreen.kt +++ b/app/src/main/java/com/android/polybazaar/profile/ui/ProfileScreen.kt @@ -1,5 +1,6 @@ // Portions of this code were generated with the help of Claude Code. // Co-authored-by: Claude Code (Claude Opus 5.5) +// Co-authored-by: Copilot (Auto) package com.android.polybazaar.profile.ui import androidx.compose.foundation.background @@ -24,6 +25,7 @@ import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -31,6 +33,7 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview @@ -54,6 +57,7 @@ object ProfileScreenTags { const val ERROR_MESSAGE = "profile_error_message" const val RECENT_ACTIVITY = "profile_recent_activity" const val EDIT_PROFILE_BUTTON = "profile_edit_profile_button" + const val MY_BOOKINGS_BUTTON = "profile_my_bookings_button" } /** The fixed cards take about 450 dp; the rest leaves the Toolbox room to show a few rows. */ @@ -68,6 +72,7 @@ private val MinPageHeight = 640.dp * @param error the error to show, if any. * @param onEditProfile called when the user taps "Edit profile". * @param onOpenSettings called when the user taps the settings button. + * @param onOpenBookings called when the user taps "My bookings". * @param toolbox the user's Toolbox, shown under the identity card in a bounded height. */ @Composable @@ -78,6 +83,7 @@ fun ProfileContent( onEditProfile: () -> Unit, onOpenSettings: () -> Unit, photo: ByteArray? = null, + onOpenBookings: () -> Unit = {}, toolbox: @Composable () -> Unit = {}, ) { BoxWithConstraints( @@ -107,7 +113,17 @@ fun ProfileContent( Spacer(modifier = Modifier.height(24.dp)) // Takes the height the other cards leave, and its content scrolls inside that height. Box(modifier = Modifier.fillMaxWidth().weight(1f)) { toolbox() } - RecentActivityCard(modifier = Modifier.padding(vertical = 24.dp)) + RecentActivityCard(modifier = Modifier.padding(top = 24.dp, bottom = 8.dp)) + TextButton( + onClick = onOpenBookings, + modifier = Modifier.fillMaxWidth().testTag(ProfileScreenTags.MY_BOOKINGS_BUTTON), + ) { + Text( + text = stringResource(R.string.renter_bookings_title), + color = AuthColors.Accent, + fontWeight = FontWeight.Bold, + ) + } EditProfileButton(onClick = onEditProfile, enabled = profile != null) } } diff --git a/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt b/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt index a9b25926..1c30ae64 100644 --- a/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt +++ b/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt @@ -2,6 +2,7 @@ // Co-authored-by: Claude Code (Claude Sonnet 5.5) // Co-authored-by: Copilot GPT-5.6 Terra // Co-authored-by: Claude Code (Claude Fable 5.2) +// Co-authored-by: Copilot (Auto) package com.android.polybazaar.ui.navigation import androidx.activity.compose.BackHandler @@ -58,6 +59,8 @@ import com.android.polybazaar.auth.viewmodel.ForgotPasswordViewModel import com.android.polybazaar.auth.viewmodel.VerifyEmailViewModel import com.android.polybazaar.booking.model.BookingRepository import com.android.polybazaar.booking.ui.BookingRequestScreen +import com.android.polybazaar.booking.ui.LenderBookingsScreen +import com.android.polybazaar.booking.ui.RenterBookingsScreen import com.android.polybazaar.booking.viewmodel.BookingRequestViewModel import com.android.polybazaar.booking.viewmodel.BookingViewModel import com.android.polybazaar.browse.ui.BrowseScreen @@ -365,6 +368,9 @@ fun AppNavHost( onEdit = { navController.navigate(Routes.editListing(it)) { launchSingleTop = true } }, + onOpenBookings = { + navController.navigate(Routes.lenderBookings(it)) { launchSingleTop = true } + }, onDeleted = { navController.popBackStack() }, // The viewer messages the owner as the renter. Single top, so a double tap // does not stack two conversation screens. @@ -405,7 +411,12 @@ fun AppNavHost( ) val bookingViewModel: BookingViewModel = viewModel( - factory = viewModelFactory { initializer { BookingViewModel(bookingRepository) } } + factory = + viewModelFactory { + initializer { + BookingViewModel(bookingRepository, listingRepository, profileRepository) + } + } ) BookingRequestScreen( viewModel = requestViewModel, @@ -415,6 +426,43 @@ fun AppNavHost( onBack = dropUnlessResumed { navController.popBackStack() }, ) } + composable(Routes.RENTER_BOOKINGS) { + val bookingViewModel: BookingViewModel = + viewModel( + key = "renter_bookings", + factory = + viewModelFactory { + initializer { + BookingViewModel(bookingRepository, listingRepository, profileRepository) + } + }, + ) + RenterBookingsScreen( + viewModel = bookingViewModel, + onBack = dropUnlessResumed { navController.popBackStack() }, + ) + } + composable( + route = Routes.LENDER_BOOKINGS, + arguments = listOf(navArgument(Routes.LISTING_ID) { type = NavType.StringType }), + ) { entry -> + val listingId = entry.arguments?.getString(Routes.LISTING_ID) ?: return@composable + val bookingViewModel: BookingViewModel = + viewModel( + key = "lender_bookings_$listingId", + factory = + viewModelFactory { + initializer { + BookingViewModel(bookingRepository, listingRepository, profileRepository) + } + }, + ) + LenderBookingsScreen( + listingId = listingId, + viewModel = bookingViewModel, + onBack = dropUnlessResumed { navController.popBackStack() }, + ) + } composable( route = Routes.LENDER_PROFILE, arguments = listOf(navArgument(Routes.LENDER_UID) { type = NavType.StringType }), @@ -524,6 +572,9 @@ fun AppNavHost( onOpenSettings = { navController.navigate(Routes.SETTINGS) { launchSingleTop = true } }, + onOpenBookings = { + navController.navigate(Routes.RENTER_BOOKINGS) { launchSingleTop = true } + }, toolbox = { ToolboxCard( viewModel = toolboxViewModel, diff --git a/app/src/main/java/com/android/polybazaar/ui/navigation/Routes.kt b/app/src/main/java/com/android/polybazaar/ui/navigation/Routes.kt index 6fad198e..b76b96bc 100644 --- a/app/src/main/java/com/android/polybazaar/ui/navigation/Routes.kt +++ b/app/src/main/java/com/android/polybazaar/ui/navigation/Routes.kt @@ -2,6 +2,7 @@ // Co-authored-by: Claude Code (Claude Sonnet 5.5) // Co-authored-by: Copilot GPT-5.6 Terra // Co-authored-by: Claude Code (Claude Fable 5.2) +// Co-authored-by: Copilot (Auto) package com.android.polybazaar.ui.navigation import android.net.Uri @@ -26,6 +27,8 @@ object Routes { const val RENTER_UID = "renterUid" const val CONVERSATION = "conversation/{$LISTING_ID}/{$RENTER_UID}" const val BOOKING_REQUEST = "booking_request/{$LISTING_ID}" + const val RENTER_BOOKINGS = "renter_bookings" + const val LENDER_BOOKINGS = "lender_bookings/{$LISTING_ID}" /** The route of the "Edit listing" screen for the listing [listingId]. */ fun editListing(listingId: String) = "edit_listing/${Uri.encode(listingId)}" @@ -45,4 +48,7 @@ object Routes { /** The route of the screen where a renter requests the listing [listingId] for some days. */ fun bookingRequest(listingId: String) = "booking_request/${Uri.encode(listingId)}" + + /** The route of the lender's bookings of the listing [listingId]. */ + fun lenderBookings(listingId: String) = "lender_bookings/${Uri.encode(listingId)}" } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ac2de988..06b71512 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -235,4 +235,12 @@ You asked for %1$s. The lender still has to accept it. Done Retry + My bookings + Booking requests + No bookings yet. + Cancel + Cancelling… + Requested + Confirmed + Cancelled diff --git a/app/src/sharedTest/java/com/android/polybazaar/booking/model/FakeBookingRepository.kt b/app/src/sharedTest/java/com/android/polybazaar/booking/model/FakeBookingRepository.kt index b1b88251..d0af4d83 100644 --- a/app/src/sharedTest/java/com/android/polybazaar/booking/model/FakeBookingRepository.kt +++ b/app/src/sharedTest/java/com/android/polybazaar/booking/model/FakeBookingRepository.kt @@ -20,6 +20,7 @@ class FakeBookingRepository : BookingRepository { var writeFailure: ((Exception) -> Unit)? = null var requestJob: Job? = null var renterBookings: List = emptyList() + var listingBookings: List = emptyList() var pendingLoad: CompletableDeferred? = null var loadFailure: Exception? = null var loadCount = 0 @@ -39,7 +40,12 @@ class FakeBookingRepository : BookingRepository { failure?.let { throw it } } - override suspend fun getBookingsForListing(listingId: String): List = emptyList() + override suspend fun getBookingsForListing(listingId: String): List { + loadCount++ + pendingLoad?.await() + loadFailure?.let { throw it } + return listingBookings + } override suspend fun getBookingsForRenter(): List { loadCount++ diff --git a/app/src/test/java/com/android/polybazaar/booking/ui/BookingListScreensTest.kt b/app/src/test/java/com/android/polybazaar/booking/ui/BookingListScreensTest.kt new file mode 100644 index 00000000..3a9dc69c --- /dev/null +++ b/app/src/test/java/com/android/polybazaar/booking/ui/BookingListScreensTest.kt @@ -0,0 +1,258 @@ +// Co-authored-by: Copilot (Auto) +package com.android.polybazaar.booking.ui + +import androidx.compose.ui.test.assertCountEquals +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertTextEquals +import androidx.compose.ui.test.junit4.v2.createComposeRule +import androidx.compose.ui.test.onAllNodesWithTag +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.polybazaar.booking.model.Booking +import com.android.polybazaar.booking.model.BookingStatus +import com.android.polybazaar.booking.model.FakeBookingRepository +import com.android.polybazaar.booking.viewmodel.BookingUiState +import com.android.polybazaar.booking.viewmodel.BookingViewModel +import com.android.polybazaar.error.model.AppError +import com.android.polybazaar.error.model.AppException +import java.time.LocalDate +import kotlinx.coroutines.CompletableDeferred +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class BookingListScreensTest { + + @get:Rule val composeTestRule = createComposeRule() + + private fun booking(id: String, status: BookingStatus = BookingStatus.REQUESTED) = + Booking( + listingId = "listing", + renterUid = "renter", + lenderUid = "lender", + days = setOf(LocalDate.now().plusDays(5)), + status = status, + id = id, + ) + + private fun show( + state: BookingUiState, + onBack: () -> Unit = {}, + onRetry: () -> Unit = {}, + onCancel: (String) -> Unit = {}, + showRenter: Boolean = false, + ) { + composeTestRule.setContent { + BookingListContent( + title = "My bookings", + uiState = state, + onBack = onBack, + onRetry = onRetry, + onCancel = onCancel, + showRenter = showRenter, + ) + } + } + + @Test + fun finishedBooking_hasNoCancelButton() { + val finished = booking("a").copy(days = setOf(LocalDate.now().minusDays(1))) + show(BookingUiState(bookings = listOf(finished))) + + statuses().assertCountEquals(1) + composeTestRule.onAllNodesWithTag(BookingListScreenTags.CANCEL_BUTTON).assertCountEquals(0) + } + + @Test + fun renterScreen_namesBookingsAfterTheirListing() { + show( + BookingUiState( + bookings = listOf(booking("a")), + listingTitles = mapOf("listing" to "Bosch drill set"), + renterNames = mapOf("renter" to "James Richard"), + ) + ) + + composeTestRule.onNodeWithTag(BookingListScreenTags.LABEL).assertTextEquals("Bosch drill set") + } + + @Test + fun lenderScreen_namesBookingsAfterTheirRenter() { + show( + BookingUiState( + bookings = listOf(booking("a")), + listingTitles = mapOf("listing" to "Bosch drill set"), + renterNames = mapOf("renter" to "James Richard"), + ), + showRenter = true, + ) + + composeTestRule.onNodeWithTag(BookingListScreenTags.LABEL).assertTextEquals("James Richard") + } + + @Test + fun bookingWithoutKnownName_isListedWithoutLabel() { + show(BookingUiState(bookings = listOf(booking("a")))) + + composeTestRule.onAllNodesWithTag(BookingListScreenTags.LABEL).assertCountEquals(0) + } + + @Test + fun retryAfterRefusedCancellation_cancelsAgainInsteadOfReloading() { + val cancelled = mutableListOf() + var reloads = 0 + show( + BookingUiState( + bookings = listOf(booking("a")), + failedCancelId = "a", + error = AppError.PERMISSION_DENIED, + ), + onRetry = { reloads++ }, + onCancel = { cancelled += it }, + ) + + composeTestRule.onNodeWithTag(BookingListScreenTags.RETRY_BUTTON).performClick() + + assertEquals(listOf("a"), cancelled) + assertEquals(0, reloads) + } + + @Test + fun retryAfterLoadError_reloads() { + var reloads = 0 + show(BookingUiState(error = AppError.NETWORK), onRetry = { reloads++ }) + + composeTestRule.onNodeWithTag(BookingListScreenTags.RETRY_BUTTON).performClick() + + assertEquals(1, reloads) + } + + private fun statuses() = composeTestRule.onAllNodesWithTag(BookingListScreenTags.STATUS) + + @Test + fun cancelButton_callsOnCancelWithTheBookingId() { + val cancelled = mutableListOf() + show(BookingUiState(bookings = listOf(booking("a"))), onCancel = { cancelled += it }) + + composeTestRule.onNodeWithTag(BookingListScreenTags.CANCEL_BUTTON).performClick() + + assertEquals(listOf("a"), cancelled) + } + + @Test + fun cancellingBooking_showsProgressInsteadOfTheButton() { + show(BookingUiState(bookings = listOf(booking("a")), cancellingBookingIds = setOf("a"))) + + composeTestRule.onNodeWithTag(BookingListScreenTags.CANCELLING).assertIsDisplayed() + composeTestRule.onAllNodesWithTag(BookingListScreenTags.CANCEL_BUTTON).assertCountEquals(0) + } + + @Test + fun cancelledBooking_hasNoCancelButton() { + show(BookingUiState(bookings = listOf(booking("a", BookingStatus.CANCELLED)))) + + composeTestRule.onAllNodesWithTag(BookingListScreenTags.CANCEL_BUTTON).assertCountEquals(0) + statuses().assertCountEquals(1) + } + + @Test + fun loadingAndErrorStates_areShown() { + show(BookingUiState(isLoadingBookings = true)) + composeTestRule.onNodeWithTag(BookingListScreenTags.LOADING_INDICATOR).assertIsDisplayed() + } + + @Test + fun loadError_showsMessageAndRetry() { + show(BookingUiState(error = AppError.NETWORK)) + + composeTestRule.onNodeWithTag(BookingListScreenTags.ERROR_MESSAGE).assertIsDisplayed() + composeTestRule.onNodeWithTag(BookingListScreenTags.RETRY_BUTTON).assertIsDisplayed() + } + + @Test + fun emptyBookings_showsEmptyMessageAndBackCallsCallback() { + var backs = 0 + show(BookingUiState(), onBack = { backs++ }) + + composeTestRule.onNodeWithTag(BookingListScreenTags.EMPTY).assertIsDisplayed() + composeTestRule.onNodeWithTag(BookingListScreenTags.BACK_BUTTON).performClick() + + assertEquals(1, backs) + } + + @Test + fun lenderBookingsScreen_retriesLoadAndCancelsBooking() { + val repository = + FakeBookingRepository().apply { + loadFailure = AppException(AppError.NETWORK) + listingBookings = listOf(booking("a")) + } + val viewModel = BookingViewModel(repository) + var backs = 0 + composeTestRule.setContent { + LenderBookingsScreen( + listingId = "listing", + viewModel = viewModel, + onBack = { backs++ }, + ) + } + composeTestRule.waitUntil { viewModel.uiState.value.error != null } + repository.loadFailure = null + composeTestRule.onNodeWithTag(BookingListScreenTags.RETRY_BUTTON).performClick() + + composeTestRule.waitUntil { viewModel.uiState.value.bookings.isNotEmpty() } + assertEquals(2, repository.loadCount) + + composeTestRule.onNodeWithTag(BookingListScreenTags.CANCEL_BUTTON).performClick() + composeTestRule.waitUntil { + viewModel.uiState.value.bookings.single().status == BookingStatus.CANCELLED + } + composeTestRule.onNodeWithTag(BookingListScreenTags.BACK_BUTTON).performClick() + assertEquals(1, backs) + } + + @Test + fun offlineCancellation_isShownCancelledThenRestoredWhenServerRejectsIt() { + val repository = FakeBookingRepository() + repository.renterBookings = listOf(booking("a")) + val viewModel = BookingViewModel(repository) + composeTestRule.setContent { RenterBookingsScreen(viewModel = viewModel, onBack = {}) } + composeTestRule.waitUntil { viewModel.uiState.value.bookings.isNotEmpty() } + + composeTestRule.onNodeWithTag(BookingListScreenTags.CANCEL_BUTTON).performClick() + composeTestRule.waitUntil { + viewModel.uiState.value.bookings[0].status == BookingStatus.CANCELLED + } + composeTestRule.onAllNodesWithTag(BookingListScreenTags.CANCEL_BUTTON).assertCountEquals(0) + + // The server answers after the write was queued locally. + composeTestRule.runOnIdle { + repository.cancelWriteFailure?.invoke(AppException(AppError.PERMISSION_DENIED)) + } + + composeTestRule.onNodeWithTag(BookingListScreenTags.ERROR_MESSAGE).assertIsDisplayed() + composeTestRule.onNodeWithTag(BookingListScreenTags.CANCEL_BUTTON).assertIsDisplayed() + assertEquals(BookingStatus.REQUESTED, viewModel.uiState.value.bookings[0].status) + } + + @Test + fun pendingCancellation_showsProgressUntilQueued() { + val repository = FakeBookingRepository() + val gate = CompletableDeferred() + repository.renterBookings = listOf(booking("a")) + val viewModel = BookingViewModel(repository) + composeTestRule.setContent { RenterBookingsScreen(viewModel = viewModel, onBack = {}) } + composeTestRule.waitUntil { viewModel.uiState.value.bookings.isNotEmpty() } + repository.pendingCancel = gate + + composeTestRule.onNodeWithTag(BookingListScreenTags.CANCEL_BUTTON).performClick() + composeTestRule.onNodeWithTag(BookingListScreenTags.CANCELLING).assertIsDisplayed() + + gate.complete(Unit) + composeTestRule.waitUntil { viewModel.uiState.value.cancellingBookingIds.isEmpty() } + composeTestRule.onAllNodesWithTag(BookingListScreenTags.CANCELLING).assertCountEquals(0) + } +} diff --git a/app/src/test/java/com/android/polybazaar/booking/viewmodel/BookingViewModelTest.kt b/app/src/test/java/com/android/polybazaar/booking/viewmodel/BookingViewModelTest.kt index dd985108..dc073fd6 100644 --- a/app/src/test/java/com/android/polybazaar/booking/viewmodel/BookingViewModelTest.kt +++ b/app/src/test/java/com/android/polybazaar/booking/viewmodel/BookingViewModelTest.kt @@ -4,11 +4,16 @@ package com.android.polybazaar.booking.viewmodel import androidx.lifecycle.ViewModelStore +import com.android.polybazaar.auth.model.User import com.android.polybazaar.booking.model.Booking import com.android.polybazaar.booking.model.BookingStatus import com.android.polybazaar.booking.model.FakeBookingRepository import com.android.polybazaar.error.model.AppError import com.android.polybazaar.error.model.AppException +import com.android.polybazaar.listing.model.FakeListingRepository +import com.android.polybazaar.listing.model.ItemListing +import com.android.polybazaar.listing.model.ListingCategory +import com.android.polybazaar.profile.model.FakeProfileRepository import java.time.LocalDate import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CompletableDeferred @@ -167,6 +172,85 @@ class BookingViewModelTest { assertFalse(viewModel.uiState.value.isLoadingBookings) } + @Test + fun loadListingBookings_exposesResultsAndFailures() = runTest { + val expected = listOf(booking.copy(id = "booking-id")) + repository.listingBookings = expected + val viewModel = BookingViewModel(repository) + + viewModel.loadListingBookings("listing") + testDispatcher.scheduler.advanceUntilIdle() + assertEquals(expected, viewModel.uiState.value.bookings) + + repository.loadFailure = AppException(AppError.PERMISSION_DENIED) + viewModel.loadListingBookings("listing") + testDispatcher.scheduler.advanceUntilIdle() + assertEquals(AppError.PERMISSION_DENIED, viewModel.uiState.value.error) + assertFalse(viewModel.uiState.value.isLoadingBookings) + } + + @Test + fun loadRenterBookings_sortsByEarliestDayAndNamesListings() = runTest { + val drill = + ItemListing( + category = ListingCategory.ITEM_TOOLS, + price = 8.0, + title = "Bosch drill set", + description = "Cordless drill.", + refundValue = 120.0, + maxRentalDays = 3, + listingId = "listing", + ownerUid = "lender", + ) + val later = booking.copy(id = "later", days = setOf(LocalDate.of(2026, 12, 20))) + val earlier = + booking.copy(id = "earlier", listingId = "gone", days = setOf(LocalDate.of(2026, 12, 2))) + repository.renterBookings = listOf(later, earlier) + val viewModel = + BookingViewModel(repository, listingRepository = FakeListingRepository(listOf(drill))) + + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(listOf("earlier", "later"), viewModel.uiState.value.bookings.map { it.id }) + assertEquals(mapOf("listing" to "Bosch drill set"), viewModel.uiState.value.listingTitles) + } + + @Test + fun loadListingBookings_namesRentersAndSkipsUnreadableProfiles() = runTest { + val james = User(uid = "renter", email = "j@epfl.ch", username = "James Richard") + val profiles = FakeProfileRepository(mapOf("renter" to james)).apply { failingUids += "other" } + repository.listingBookings = + listOf(booking.copy(id = "a"), booking.copy(id = "b", renterUid = "other")) + val viewModel = BookingViewModel(repository, profileRepository = profiles) + + viewModel.loadListingBookings("listing") + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(mapOf("renter" to "James Richard"), viewModel.uiState.value.renterNames) + assertEquals(2, viewModel.uiState.value.bookings.size) + assertEquals(null, viewModel.uiState.value.error) + } + + @Test + fun cancelBooking_remembersTheRefusedBookingForRetryUntilTheNextAction() = runTest { + repository.renterBookings = listOf(booking.copy(id = "a")) + val viewModel = BookingViewModel(repository) + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + repository.cancelFailure = AppException(AppError.PERMISSION_DENIED) + viewModel.cancelBooking("a") + testDispatcher.scheduler.advanceUntilIdle() + assertEquals("a", viewModel.uiState.value.failedCancelId) + + repository.cancelFailure = null + viewModel.cancelBooking("a") + testDispatcher.scheduler.advanceUntilIdle() + assertEquals(null, viewModel.uiState.value.failedCancelId) + assertEquals(BookingStatus.CANCELLED, viewModel.uiState.value.bookings.single().status) + } + @Test fun loadRenterBookings_exposesFailures() = runTest { repository.loadFailure = AppException(AppError.NETWORK) diff --git a/app/src/test/java/com/android/polybazaar/listing/ui/ListingDetailScreenTest.kt b/app/src/test/java/com/android/polybazaar/listing/ui/ListingDetailScreenTest.kt index a5cceeb6..52f3c7ee 100644 --- a/app/src/test/java/com/android/polybazaar/listing/ui/ListingDetailScreenTest.kt +++ b/app/src/test/java/com/android/polybazaar/listing/ui/ListingDetailScreenTest.kt @@ -418,7 +418,14 @@ class ListingDetailScreenTest { @Test fun owner_seesEditListing_insteadOfTheRenterActions() { val edited = mutableListOf() - setContent(ownerState(), ListingDetailActions(onEdit = { edited += it })) + val openedBookings = mutableListOf() + setContent( + ownerState(), + ListingDetailActions( + onEdit = { edited += it }, + onOpenBookings = { openedBookings += it }, + ), + ) node(ListingDetailScreenTags.CHOOSE_DATES_BUTTON).assertDoesNotExist() node(ListingDetailScreenTags.MESSAGE_BUTTON).assertDoesNotExist() @@ -428,6 +435,15 @@ class ListingDetailScreenTest { .assertTextEquals(context.getString(R.string.listing_detail_owner_reassurance)) node(ListingDetailScreenTags.EDIT_BUTTON).assertWidthIsEqualTo(166.dp).performClick() assertEquals(listOf("drill"), edited) + node(ListingDetailScreenTags.BOOKING_REQUESTS_BUTTON).performClick() + assertEquals(listOf("drill"), openedBookings) + } + + @Test + fun ownerListingWithoutId_doesNotShowBookingRequests() { + setContent(ownerState(drill.copy(listingId = null))) + + node(ListingDetailScreenTags.BOOKING_REQUESTS_BUTTON).assertDoesNotExist() } @Test diff --git a/app/src/test/java/com/android/polybazaar/ui/navigation/AppNavHostTest.kt b/app/src/test/java/com/android/polybazaar/ui/navigation/AppNavHostTest.kt index dd10552b..cfccbf8d 100644 --- a/app/src/test/java/com/android/polybazaar/ui/navigation/AppNavHostTest.kt +++ b/app/src/test/java/com/android/polybazaar/ui/navigation/AppNavHostTest.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.test.hasTestTag import androidx.compose.ui.test.hasText import androidx.compose.ui.test.junit4.StateRestorationTester import androidx.compose.ui.test.junit4.v2.createComposeRule +import androidx.compose.ui.test.onAllNodesWithTag import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText @@ -64,6 +65,7 @@ import com.android.polybazaar.booking.model.Booking import com.android.polybazaar.booking.model.FakeBookingRepository import com.android.polybazaar.booking.ui.AvailabilityCalendarSheetTags import com.android.polybazaar.booking.ui.AvailabilityCalendarTags +import com.android.polybazaar.booking.ui.BookingListScreenTags import com.android.polybazaar.booking.ui.BookingRequestScreenTags import com.android.polybazaar.browse.ui.BrowseScreenTags import com.android.polybazaar.chat.model.ChatMessage @@ -1030,6 +1032,57 @@ class AppNavHostTest { assertCurrentRoute(Routes.BOOKING_REQUEST, Routes.LISTING_ID, listingId) } + @Test + fun profileMyBookings_opensRenterBookings_andBackReturnsToProfile() { + setContent(FakeAuthRepository(currentUser = user)) + openProfile() + + composeTestRule + .onNodeWithTag(ProfileScreenTags.MY_BOOKINGS_BUTTON) + .performScrollTo() + .performClick() + + composeTestRule.onNodeWithTag(BookingListScreenTags.SCREEN).assertIsDisplayed() + composeTestRule.onNodeWithTag(BookingListScreenTags.EMPTY).assertIsDisplayed() + assertEquals(Routes.RENTER_BOOKINGS, navController.currentBackStackEntry?.destination?.route) + assertBottomBarHidden() + composeTestRule.onNodeWithTag(BookingListScreenTags.BACK_BUTTON).performClick() + composeTestRule.onNodeWithTag(ProfileScreenTags.SCREEN).assertIsDisplayed() + } + + @Test + fun listingOwner_bookingRequestsOpensBookingsForThatListing() { + listingRepository.myListings = listOf(gracesDrill.copy(ownerUid = user.uid)) + bookingRepository.listingBookings = + listOf( + Booking( + listingId = "drill", + renterUid = "uid-renter", + lenderUid = user.uid, + days = setOf(LocalDate.of(2026, 11, 13)), + id = "booking", + ) + ) + setContent(FakeAuthRepository(currentUser = user)) + openProfile() + composeTestRule.onNodeWithTag(ToolboxCardTags.LISTING_ROW).performClick() + assertOnListingDetail("Bosch drill set") + + composeTestRule.onNodeWithTag(ListingDetailScreenTags.BOOKING_REQUESTS_BUTTON).performClick() + + composeTestRule.waitUntil { + composeTestRule + .onAllNodesWithTag(BookingListScreenTags.STATUS) + .fetchSemanticsNodes() + .isNotEmpty() + } + composeTestRule.onNodeWithTag(BookingListScreenTags.SCREEN).assertIsDisplayed() + assertCurrentRoute(Routes.LENDER_BOOKINGS, Routes.LISTING_ID, "drill") + assertBottomBarHidden() + composeTestRule.onNodeWithTag(BookingListScreenTags.BACK_BUTTON).performClick() + assertOnListingDetail("Bosch drill set") + } + @Test fun listingDetailChooseDates_opensTheBookingRequestForTheListing() { listingRepository.allListings = listOf(gracesDrill) diff --git a/app/src/test/java/com/android/polybazaar/ui/navigation/RoutesTest.kt b/app/src/test/java/com/android/polybazaar/ui/navigation/RoutesTest.kt new file mode 100644 index 00000000..097dac79 --- /dev/null +++ b/app/src/test/java/com/android/polybazaar/ui/navigation/RoutesTest.kt @@ -0,0 +1,16 @@ +// Co-authored-by: Copilot (Auto) +package com.android.polybazaar.ui.navigation + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class RoutesTest { + + @Test + fun lenderBookings_encodesTheListingId() { + assertEquals("lender_bookings/a%2Fb%3Fc%20d", Routes.lenderBookings("a/b?c d")) + } +} diff --git a/firestore.rules b/firestore.rules index e9a4ba70..fae6b85e 100644 --- a/firestore.rules +++ b/firestore.rules @@ -125,6 +125,9 @@ service cloud.firestore { allow update: if isVerified() && (resource.data.lenderUid == request.auth.uid || resource.data.renterUid == request.auth.uid) && resource.data.status in ['REQUESTED', 'CONFIRMED'] + // A finished booking is history. The app stores the days earliest first, so the last + // one decides; it must not be before today by server time. + && resource.data.days[resource.data.days.size() - 1] >= request.time.toMillis() / 86400000 && request.resource.data.status == 'CANCELLED' && request.resource.data.diff(resource.data).affectedKeys().hasOnly(['status']); allow delete: if false; diff --git a/rules-tests/firestore.test.js b/rules-tests/firestore.test.js index c2ab2f82..c2840bcb 100644 --- a/rules-tests/firestore.test.js +++ b/rules-tests/firestore.test.js @@ -483,6 +483,16 @@ describe("listings", () => { await assertFails(deleteDoc(doc(verified(BOB), "bookings/requested"))); }); + test("a finished booking cannot be cancelled", async () => { + const today = Math.floor(Date.now() / 86_400_000); + await seed("bookings/finished", booking({ days: [today - 5, today - 3] })); + await seed("bookings/ends-today", booking({ days: [today - 2, today] })); + + await assertFails(updateDoc(doc(verified(BOB), "bookings/finished"), { status: "CANCELLED" })); + await assertFails(updateDoc(doc(verified(ALICE), "bookings/finished"), { status: "CANCELLED" })); + await assertSucceeds(updateDoc(doc(verified(BOB), "bookings/ends-today"), { status: "CANCELLED" })); + }); + test("cancellation cannot change fields other than status", async () => { await seed("bookings/b1", booking()); const ref = doc(verified(BOB), "bookings/b1");