From 5146fdb0f6ac7bcac8a9911793e1ab0435e4a4b4 Mon Sep 17 00:00:00 2001 From: Adrian Mikhaiel Date: Tue, 17 Nov 2026 15:03:03 +0100 Subject: [PATCH 1/5] feat(cancel): implemented the cancel booking us --- .../booking/model/BookingRepository.kt | 13 +++ .../model/FirebaseBookingRepository.kt | 40 ++++++++- .../booking/viewmodel/BookingViewModel.kt | 63 +++++++++++++ .../booking/model/FakeBookingRepository.kt | 22 +++++ .../model/FirebaseBookingRepositoryTest.kt | 88 +++++++++++++++++++ .../booking/viewmodel/BookingViewModelTest.kt | 87 ++++++++++++++++++ firestore.rules | 7 +- rules-tests/firestore.test.js | 42 ++++++++- 8 files changed, 356 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt b/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt index 9c277ec3..dbd52fdb 100644 --- a/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt +++ b/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt @@ -15,4 +15,17 @@ interface BookingRepository { /** Returns bookings for this listing owned by the signed-in lender. */ suspend fun getBookingsForListing(listingId: String): List + + /** Returns bookings made by the signed-in renter. */ + suspend fun getBookingsForRenter(): List + + /** + * Queues a cancellation. A stale status or offline write failure may arrive after local queuing + * through [onWriteFailure]. [onWriteSuccess] runs after the server accepts the cancellation. + */ + suspend fun cancelBooking( + id: String, + onWriteFailure: (Exception) -> Unit = {}, + onWriteSuccess: () -> Unit = {}, + ) } diff --git a/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt b/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt index b3a217f0..c5b835f5 100644 --- a/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt +++ b/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt @@ -15,7 +15,7 @@ class FirebaseBookingRepository( private val firestore: FirebaseFirestore = FirebaseFirestore.getInstance(), private val auth: FirebaseAuth = FirebaseAuth.getInstance(), private val logWriteFailure: (Exception) -> Unit = { - Log.e("BookingRepository", "Booking request failed", it) + Log.e("BookingRepository", "Booking write failed", it) }, ) : BookingRepository { @@ -67,6 +67,44 @@ class FirebaseBookingRepository( .map { it.toBooking() } } + override suspend fun getBookingsForRenter(): List { + val uid = + auth.currentUser?.uid + ?: throw FirebaseFirestoreException( + "Sign in to read bookings", + FirebaseFirestoreException.Code.UNAUTHENTICATED, + ) + return firestore + .collection("bookings") + .whereEqualTo("renterUid", uid) + .get() + .await() + .documents + .map { it.toBooking() } + } + + override suspend fun cancelBooking( + id: String, + onWriteFailure: (Exception) -> Unit, + onWriteSuccess: () -> Unit, + ) { + if (auth.currentUser == null) { + throw FirebaseFirestoreException( + "Sign in to cancel a booking", + FirebaseFirestoreException.Code.UNAUTHENTICATED, + ) + } + firestore + .collection("bookings") + .document(id) + .update("status", BookingStatus.CANCELLED.name) + .addOnFailureListener(Executor { it.run() }) { + logWriteFailure(it) + onWriteFailure(it) + } + .addOnSuccessListener(Executor { it.run() }) { onWriteSuccess() } + } + private fun DocumentSnapshot.toBooking(): Booking { fun string(field: String): String = getString(field) ?: throw IllegalStateException("Booking $id is missing $field") 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 7ae3436e..6f96990d 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 @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.android.polybazaar.booking.model.Booking 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 kotlinx.coroutines.CancellationException @@ -18,6 +19,9 @@ data class BookingUiState( val isSubmitting: Boolean = false, /** True after local queuing; it does not mean the server confirmed or lender accepted it. */ val isQueued: Boolean = false, + val bookings: List = emptyList(), + val isLoadingBookings: Boolean = false, + val cancellingBookingIds: Set = emptySet(), val error: AppError? = null, ) @@ -58,4 +62,63 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM fun acknowledgeQueuedBooking() { _uiState.update { it.copy(isQueued = false) } } + + /** Loads bookings made by the signed-in renter. */ + fun loadRenterBookings() { + if (_uiState.value.isLoadingBookings) return + _uiState.update { it.copy(isLoadingBookings = true, error = null) } + viewModelScope.launch { + try { + val bookings = bookingRepository.getBookingsForRenter() + _uiState.update { it.copy(bookings = bookings, isLoadingBookings = false) } + } catch (exception: Exception) { + if (exception is CancellationException) { + _uiState.update { it.copy(isLoadingBookings = false) } + throw exception + } + _uiState.update { it.copy(isLoadingBookings = false, error = exception.toAppError()) } + } + } + } + + /** Queues one cancellation at a time per booking and waits for server acceptance or rejection. */ + fun cancelBooking(id: String) { + val state = _uiState.value + if (id in state.cancellingBookingIds) return + if (state.bookings.any { it.id == id && it.status == BookingStatus.CANCELLED }) return + _uiState.update { + it.copy(cancellingBookingIds = it.cancellingBookingIds + id, error = null) + } + viewModelScope.launch { + try { + bookingRepository.cancelBooking( + id = id, + onWriteFailure = { exception -> + _uiState.update { + it.copy( + cancellingBookingIds = it.cancellingBookingIds - id, + error = exception.toAppError(), + ) + } + }, + onWriteSuccess = { + _uiState.update { + it.copy( + bookings = + it.bookings.map { booking -> + if (booking.id == id) booking.copy(status = BookingStatus.CANCELLED) + else booking + }, + cancellingBookingIds = it.cancellingBookingIds - id, + ) + } + }, + ) + } catch (exception: Exception) { + _uiState.update { it.copy(cancellingBookingIds = it.cancellingBookingIds - id) } + if (exception is CancellationException) throw exception + _uiState.update { it.copy(error = exception.toAppError()) } + } + } + } } 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 9bc0eb47..a2b3e1f2 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 @@ -19,6 +19,12 @@ class FakeBookingRepository : BookingRepository { var immediateWriteFailure: Exception? = null var writeFailure: ((Exception) -> Unit)? = null var requestJob: Job? = null + var renterBookings: List = emptyList() + var pendingLoad: CompletableDeferred? = null + var loadFailure: Exception? = null + var cancellationCount = 0 + var cancelWriteFailure: ((Exception) -> Unit)? = null + var cancelWriteSuccess: (() -> Unit)? = null override suspend fun requestBooking(booking: Booking, onWriteFailure: (Exception) -> Unit) { requestJob = currentCoroutineContext()[Job] @@ -31,4 +37,20 @@ class FakeBookingRepository : BookingRepository { } override suspend fun getBookingsForListing(listingId: String): List = emptyList() + + override suspend fun getBookingsForRenter(): List { + pendingLoad?.await() + loadFailure?.let { throw it } + return renterBookings + } + + override suspend fun cancelBooking( + id: String, + onWriteFailure: (Exception) -> Unit, + onWriteSuccess: () -> Unit, + ) { + cancellationCount++ + cancelWriteFailure = onWriteFailure + cancelWriteSuccess = onWriteSuccess + } } diff --git a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt index f501410d..77da6f82 100644 --- a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt +++ b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt @@ -36,6 +36,7 @@ class FirebaseBookingRepositoryTest { private val document = mock() private val listingQuery = mock() private val lenderQuery = mock() + private val renterQuery = mock() private val snapshot = mock() private val stored = mock() private val repository = FirebaseBookingRepository(firestore, auth) @@ -57,6 +58,8 @@ class FirebaseBookingRepositoryTest { whenever(collection.document()).thenReturn(document) whenever(collection.whereEqualTo("listingId", "listing")).thenReturn(listingQuery) whenever(listingQuery.whereEqualTo("lenderUid", "lender")).thenReturn(lenderQuery) + whenever(collection.whereEqualTo("renterUid", "renter")).thenReturn(renterQuery) + whenever(collection.document("booking-id")).thenReturn(document) } @Test @@ -168,4 +171,89 @@ class FirebaseBookingRepositoryTest { (error as FirebaseFirestoreException).code, ) } + + @Test + fun getBookingsForRenterQueriesAuthenticatedRenterAndDecodesBookings() = runTest { + whenever(renterQuery.get()).thenReturn(Tasks.forResult(snapshot)) + whenever(snapshot.documents).thenReturn(listOf(stored)) + whenever(stored.getString("listingId")).thenReturn(booking.listingId) + whenever(stored.getString("renterUid")).thenReturn("renter") + whenever(stored.getString("lenderUid")).thenReturn(booking.lenderUid) + whenever(stored.getLong("startDate")).thenReturn(booking.startDate.toEpochDay()) + whenever(stored.getLong("endDate")).thenReturn(booking.endDate.toEpochDay()) + whenever(stored.getString("status")).thenReturn("REQUESTED") + whenever(stored.id).thenReturn("booking-id") + + assertEquals( + listOf(booking.copy(renterUid = "renter", id = "booking-id")), + repository.getBookingsForRenter(), + ) + verify(collection).whereEqualTo("renterUid", "renter") + } + + @Test + fun getBookingsForRenterRejectsSignedOutUser() = runTest { + whenever(auth.currentUser).thenReturn(null) + + val error = runCatching { repository.getBookingsForRenter() }.exceptionOrNull() + + assertTrue(error is FirebaseFirestoreException) + assertEquals( + FirebaseFirestoreException.Code.UNAUTHENTICATED, + (error as FirebaseFirestoreException).code, + ) + } + + @Test + fun cancelBookingQueuesOfflineWriteWithoutWaitingForServer() = runTest { + val pendingWrite = TaskCompletionSource() + whenever(document.update("status", "CANCELLED")).thenReturn(pendingWrite.task) + + withTimeout(1_000) { repository.cancelBooking("booking-id") } + + assertTrue(!pendingWrite.task.isComplete) + verify(document).update("status", "CANCELLED") + } + + @Test + fun cancelBookingReportsLaterStaleOrOfflineWriteFailures() = runTest { + val pendingWrite = TaskCompletionSource() + whenever(document.update("status", "CANCELLED")).thenReturn(pendingWrite.task) + var reportedFailure: Exception? = null + val repository = FirebaseBookingRepository(firestore, auth) { reportedFailure = it } + var reportedToCaller: Exception? = null + + repository.cancelBooking("booking-id") { reportedToCaller = it } + val failure = IllegalStateException("Write rejected") + pendingWrite.setException(failure) + + assertSame(failure, reportedFailure) + assertSame(failure, reportedToCaller) + } + + @Test + fun cancelBookingReportsServerAcceptance() = runTest { + val pendingWrite = TaskCompletionSource() + whenever(document.update("status", "CANCELLED")).thenReturn(pendingWrite.task) + var succeeded = false + + repository.cancelBooking("booking-id", onWriteSuccess = { succeeded = true }) + pendingWrite.setResult(null) + + assertTrue(succeeded) + } + + @Test + fun cancelBookingRejectsSignedOutUser() = runTest { + whenever(auth.currentUser).thenReturn(null) + + val error = runCatching { repository.cancelBooking("booking-id") }.exceptionOrNull() + + assertTrue(error is FirebaseFirestoreException) + assertEquals( + FirebaseFirestoreException.Code.UNAUTHENTICATED, + (error as FirebaseFirestoreException).code, + ) + verify(document, never()).update(any(), any()) + } } 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 105d613f..7e26af01 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 @@ -2,8 +2,10 @@ // Co-authored-by: Claude Code (Claude Fable 5.2) package com.android.polybazaar.booking.viewmodel +import androidx.lifecycle.ViewModelStore import com.android.polybazaar.booking.model.Booking import com.android.polybazaar.booking.model.FakeBookingRepository +import com.android.polybazaar.booking.model.BookingStatus import com.android.polybazaar.error.model.AppError import com.android.polybazaar.error.model.AppException import java.time.LocalDate @@ -159,4 +161,89 @@ class BookingViewModelTest { assertEquals(null, viewModel.uiState.value.error) assertTrue(repository.requestJob?.isCancelled == true) } + + @Test + fun loadRenterBookings_exposesLoadingAndResults() = runTest { + val expected = listOf(booking.copy(id = "booking-id")) + val gate = CompletableDeferred() + repository.renterBookings = expected + repository.pendingLoad = gate + val viewModel = BookingViewModel(repository) + + viewModel.loadRenterBookings() + testDispatcher.scheduler.runCurrent() + + assertTrue(viewModel.uiState.value.isLoadingBookings) + gate.complete(Unit) + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(expected, viewModel.uiState.value.bookings) + assertFalse(viewModel.uiState.value.isLoadingBookings) + } + + @Test + fun loadRenterBookings_exposesFailures() = runTest { + repository.loadFailure = AppException(AppError.NETWORK) + val viewModel = BookingViewModel(repository) + + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + assertFalse(viewModel.uiState.value.isLoadingBookings) + assertEquals(AppError.NETWORK, viewModel.uiState.value.error) + } + + @Test + fun cancelBooking_preventsDuplicatesAndUpdatesBookingOnSuccess() = runTest { + repository.renterBookings = listOf(booking.copy(id = "booking-id")) + val viewModel = BookingViewModel(repository) + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.runCurrent() + viewModel.cancelBooking("booking-id") + + assertEquals(1, repository.cancellationCount) + assertTrue("booking-id" in viewModel.uiState.value.cancellingBookingIds) + + repository.cancelWriteSuccess?.invoke() + + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + assertEquals(BookingStatus.CANCELLED, viewModel.uiState.value.bookings.single().status) + } + + @Test + fun cancelBooking_exposesWriteFailureAndAllowsRetry() = runTest { + val viewModel = BookingViewModel(repository) + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.runCurrent() + repository.cancelWriteFailure?.invoke(AppException(AppError.NETWORK)) + + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + assertEquals(AppError.NETWORK, viewModel.uiState.value.error) + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(2, repository.cancellationCount) + } + + @Test + fun cancelBooking_exposesLateWriteFailureAfterViewModelIsCleared() = runTest { + val viewModel = BookingViewModel(repository) + val viewModelStore = ViewModelStore() + viewModelStore.put("booking", viewModel) + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.runCurrent() + assertTrue("booking-id" in viewModel.uiState.value.cancellingBookingIds) + + viewModelStore.clear() + repository.cancelWriteFailure?.invoke(AppException(AppError.NETWORK)) + + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + assertEquals(AppError.NETWORK, viewModel.uiState.value.error) + } } diff --git a/firestore.rules b/firestore.rules index 8e2c2993..d0050ef4 100644 --- a/firestore.rules +++ b/firestore.rules @@ -120,7 +120,12 @@ service cloud.firestore { allow read: if isVerified() && (resource.data.lenderUid == request.auth.uid || resource.data.renterUid == request.auth.uid); allow create: if isVerified() && validBooking(request.resource.data); - allow update, delete: if false; + allow update: if isVerified() + && (resource.data.lenderUid == request.auth.uid || resource.data.renterUid == request.auth.uid) + && resource.data.status in ['REQUESTED', 'CONFIRMED'] + && request.resource.data.status == 'CANCELLED' + && request.resource.data.diff(resource.data).affectedKeys().hasOnly(['status']); + allow delete: if false; } // One conversation per listing and renter. It is created and bumped only in the same batch as a diff --git a/rules-tests/firestore.test.js b/rules-tests/firestore.test.js index 3a245f3b..a6f3ed73 100644 --- a/rules-tests/firestore.test.js +++ b/rules-tests/firestore.test.js @@ -445,11 +445,45 @@ describe("listings", () => { await assertFails(getDocs(query(collection(verified(ALICE), "bookings"), where("listingId", "==", "l1")))); }); - test("bookings cannot be updated or deleted", async () => { + test("renters and lenders can cancel requested or confirmed bookings", async () => { + await seed("bookings/renter-requested", booking()); + await seed("bookings/renter-confirmed", booking({ status: "CONFIRMED" })); + await seed("bookings/lender-requested", booking()); + await seed("bookings/lender-confirmed", booking({ status: "CONFIRMED" })); + + await assertSucceeds(updateDoc(doc(verified(BOB), "bookings/renter-requested"), { status: "CANCELLED" })); + await assertSucceeds(updateDoc(doc(verified(BOB), "bookings/renter-confirmed"), { status: "CANCELLED" })); + await assertSucceeds(updateDoc(doc(verified(ALICE), "bookings/lender-requested"), { status: "CANCELLED" })); + await assertSucceeds(updateDoc(doc(verified(ALICE), "bookings/lender-confirmed"), { status: "CANCELLED" })); + }); + + test("cancellation requires a verified renter or lender", async () => { + await seed("bookings/requested", booking()); + + await assertFails(updateDoc(doc(verified(EVE), "bookings/requested"), { status: "CANCELLED" })); + await assertFails(updateDoc(doc(unverified(BOB), "bookings/requested"), { status: "CANCELLED" })); + await assertFails(updateDoc(doc(unverified(ALICE), "bookings/requested"), { status: "CANCELLED" })); + await assertFails(updateDoc(doc(signedOut(), "bookings/requested"), { status: "CANCELLED" })); + }); + + test("cancellation rejects stale or invalid status transitions", async () => { + await seed("bookings/requested", booking()); + await seed("bookings/confirmed", booking({ status: "CONFIRMED" })); + await seed("bookings/cancelled", booking({ status: "CANCELLED" })); + + await assertFails(updateDoc(doc(verified(BOB), "bookings/cancelled"), { status: "CANCELLED" })); + await assertFails(updateDoc(doc(verified(BOB), "bookings/requested"), { status: "CONFIRMED" })); + await assertFails(updateDoc(doc(verified(BOB), "bookings/requested"), { status: "INVALID" })); + await assertFails(updateDoc(doc(verified(ALICE), "bookings/confirmed"), { status: "REQUESTED" })); + await assertFails(deleteDoc(doc(verified(BOB), "bookings/requested"))); + }); + + test("cancellation cannot change fields other than status", async () => { await seed("bookings/b1", booking()); - const ref = doc(verified(ALICE), "bookings/b1"); - await assertFails(updateDoc(ref, { status: "CONFIRMED" })); - await assertFails(deleteDoc(ref)); + const ref = doc(verified(BOB), "bookings/b1"); + + await assertFails(updateDoc(ref, { status: "CANCELLED", startDate: 21001 })); + await assertFails(updateDoc(ref, { status: "CANCELLED", extra: true })); }); }); From df584a5100a1848edab942a79cdebe0c25fc01ff Mon Sep 17 00:00:00 2001 From: Adrian Mikhaiel Date: Tue, 17 Nov 2026 16:47:06 +0100 Subject: [PATCH 2/5] added ktfmtFormat --- .../android/polybazaar/booking/viewmodel/BookingViewModel.kt | 4 +--- .../polybazaar/booking/viewmodel/BookingViewModelTest.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) 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 6f96990d..25720abc 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 @@ -86,9 +86,7 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM val state = _uiState.value if (id in state.cancellingBookingIds) return if (state.bookings.any { it.id == id && it.status == BookingStatus.CANCELLED }) return - _uiState.update { - it.copy(cancellingBookingIds = it.cancellingBookingIds + id, error = null) - } + _uiState.update { it.copy(cancellingBookingIds = it.cancellingBookingIds + id, error = null) } viewModelScope.launch { try { bookingRepository.cancelBooking( 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 7e26af01..bb468f0b 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,8 +4,8 @@ package com.android.polybazaar.booking.viewmodel import androidx.lifecycle.ViewModelStore import com.android.polybazaar.booking.model.Booking -import com.android.polybazaar.booking.model.FakeBookingRepository 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 java.time.LocalDate From 4aa1391d3e47999e9eb5383dc90270297d57b90a Mon Sep 17 00:00:00 2001 From: Adrian Mikhaiel Date: Tue, 17 Nov 2026 17:08:32 +0100 Subject: [PATCH 3/5] fix(booking): fixed the callback issue --- .../polybazaar/booking/model/FirebaseBookingRepositoryTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt index 77da6f82..7f5691b6 100644 --- a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt +++ b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt @@ -223,7 +223,7 @@ class FirebaseBookingRepositoryTest { val repository = FirebaseBookingRepository(firestore, auth) { reportedFailure = it } var reportedToCaller: Exception? = null - repository.cancelBooking("booking-id") { reportedToCaller = it } + repository.cancelBooking("booking-id", onWriteFailure = { reportedToCaller = it }) val failure = IllegalStateException("Write rejected") pendingWrite.setException(failure) From b0aa608e9f6ed1089165a3a691f34ddf3b1362ca Mon Sep 17 00:00:00 2001 From: Adrian Mikhaiel Date: Tue, 17 Nov 2026 21:04:43 +0100 Subject: [PATCH 4/5] feat(booking): increased code coverage --- .../booking/model/FakeBookingRepository.kt | 4 + .../model/FirebaseBookingRepositoryTest.kt | 15 ++++ .../booking/viewmodel/BookingViewModelTest.kt | 88 +++++++++++++++++++ 3 files changed, 107 insertions(+) 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 a2b3e1f2..121f7ccc 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 @@ -22,7 +22,9 @@ class FakeBookingRepository : BookingRepository { var renterBookings: List = emptyList() var pendingLoad: CompletableDeferred? = null var loadFailure: Exception? = null + var loadCount = 0 var cancellationCount = 0 + var cancelFailure: Exception? = null var cancelWriteFailure: ((Exception) -> Unit)? = null var cancelWriteSuccess: (() -> Unit)? = null @@ -39,6 +41,7 @@ class FakeBookingRepository : BookingRepository { override suspend fun getBookingsForListing(listingId: String): List = emptyList() override suspend fun getBookingsForRenter(): List { + loadCount++ pendingLoad?.await() loadFailure?.let { throw it } return renterBookings @@ -52,5 +55,6 @@ class FakeBookingRepository : BookingRepository { cancellationCount++ cancelWriteFailure = onWriteFailure cancelWriteSuccess = onWriteSuccess + cancelFailure?.let { throw it } } } diff --git a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt index 7f5691b6..05eaf185 100644 --- a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt +++ b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt @@ -243,6 +243,21 @@ class FirebaseBookingRepositoryTest { assertTrue(succeeded) } + @Test + fun cancelBookingWithDefaultCallbacksHandlesFailureAndSuccess() = runTest { + val failedWrite = TaskCompletionSource() + val acceptedWrite = TaskCompletionSource() + whenever(document.update("status", "CANCELLED")) + .thenReturn(failedWrite.task, acceptedWrite.task) + + repository.cancelBooking("booking-id") + repository.cancelBooking("booking-id") + failedWrite.setException(IllegalStateException("Write rejected")) + acceptedWrite.setResult(null) + + assertTrue(failedWrite.task.isComplete && acceptedWrite.task.isSuccessful) + } + @Test fun cancelBookingRejectsSignedOutUser() = runTest { whenever(auth.currentUser).thenReturn(null) 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 bb468f0b..0c1d1cf8 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 @@ -246,4 +246,92 @@ class BookingViewModelTest { assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) assertEquals(AppError.NETWORK, viewModel.uiState.value.error) } + + @Test + fun loadRenterBookings_ignoresDuplicateLoadWhileLoading() = runTest { + repository.pendingLoad = CompletableDeferred() + val viewModel = BookingViewModel(repository) + + viewModel.loadRenterBookings() + testDispatcher.scheduler.runCurrent() + viewModel.loadRenterBookings() + testDispatcher.scheduler.runCurrent() + + assertEquals(1, repository.loadCount) + } + + @Test + fun loadRenterBookings_cancellationIsNotExposedAsAnAppError() = runTest { + repository.loadFailure = CancellationException("screen closed") + val viewModel = BookingViewModel(repository) + + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + assertFalse(viewModel.uiState.value.isLoadingBookings) + assertEquals(null, viewModel.uiState.value.error) + } + + @Test + fun cancelBooking_ignoresAlreadyCancelledBooking() = runTest { + repository.renterBookings = + listOf(booking.copy(id = "booking-id", status = BookingStatus.CANCELLED)) + val viewModel = BookingViewModel(repository) + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(0, repository.cancellationCount) + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + } + + @Test + fun cancelBooking_onlyCancelsTheMatchingBooking() = runTest { + val other = booking.copy(id = "other-id", status = BookingStatus.CONFIRMED) + repository.renterBookings = listOf(booking.copy(id = "booking-id"), other) + val viewModel = BookingViewModel(repository) + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.runCurrent() + repository.cancelWriteSuccess?.invoke() + + val bookings = viewModel.uiState.value.bookings + assertEquals(BookingStatus.CANCELLED, bookings.first { it.id == "booking-id" }.status) + assertEquals(other, bookings.first { it.id == "other-id" }) + } + + @Test + fun cancelBooking_exposesRepositoryFailureAndAllowsRetry() = runTest { + repository.cancelFailure = AppException(AppError.PERMISSION_DENIED) + val viewModel = BookingViewModel(repository) + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(AppError.PERMISSION_DENIED, viewModel.uiState.value.error) + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + + repository.cancelFailure = null + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(2, repository.cancellationCount) + assertEquals(null, viewModel.uiState.value.error) + } + + @Test + fun cancelBooking_cancellationIsNotExposedAsAnAppError() = runTest { + repository.cancelFailure = CancellationException("screen closed") + val viewModel = BookingViewModel(repository) + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + assertEquals(null, viewModel.uiState.value.error) + } } From 399e831ac72a5554c48310eca09ab7ed83e18435 Mon Sep 17 00:00:00 2001 From: Adrian Mikhaiel Date: Tue, 17 Nov 2026 22:50:18 +0100 Subject: [PATCH 5/5] feat(booking): implemented the requested changes --- .../booking/model/BookingRepository.kt | 13 ++--- .../model/FirebaseBookingRepository.kt | 7 +-- .../booking/viewmodel/BookingViewModel.kt | 58 ++++++++++--------- .../booking/model/FakeBookingRepository.kt | 12 ++-- .../model/FirebaseBookingRepositoryTest.kt | 30 +++------- .../booking/viewmodel/BookingViewModelTest.kt | 43 ++++++++++---- rules-tests/firestore.test.js | 2 +- 7 files changed, 84 insertions(+), 81 deletions(-) diff --git a/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt b/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt index dbd52fdb..cdd91432 100644 --- a/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt +++ b/app/src/main/java/com/android/polybazaar/booking/model/BookingRepository.kt @@ -20,12 +20,11 @@ interface BookingRepository { suspend fun getBookingsForRenter(): List /** - * Queues a cancellation. A stale status or offline write failure may arrive after local queuing - * through [onWriteFailure]. [onWriteSuccess] runs after the server accepts the cancellation. + * Queues a cancellation without waiting for server confirmation; offline, the write stays queued + * until the connection returns. If the server later rejects it, for example because the booking + * is no longer requested or confirmed, the failure reaches [onWriteFailure]. + * + * @param onWriteFailure receives a write failure that arrives after local queuing. */ - suspend fun cancelBooking( - id: String, - onWriteFailure: (Exception) -> Unit = {}, - onWriteSuccess: () -> Unit = {}, - ) + suspend fun cancelBooking(id: String, onWriteFailure: (Exception) -> Unit = {}) } diff --git a/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt b/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt index b9cf0fdd..06d34210 100644 --- a/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt +++ b/app/src/main/java/com/android/polybazaar/booking/model/FirebaseBookingRepository.kt @@ -85,11 +85,7 @@ class FirebaseBookingRepository( .map { it.toBooking() } } - override suspend fun cancelBooking( - id: String, - onWriteFailure: (Exception) -> Unit, - onWriteSuccess: () -> Unit, - ) { + override suspend fun cancelBooking(id: String, onWriteFailure: (Exception) -> Unit) { if (auth.currentUser == null) { throw FirebaseFirestoreException( "Sign in to cancel a booking", @@ -104,7 +100,6 @@ class FirebaseBookingRepository( logWriteFailure(it) onWriteFailure(it) } - .addOnSuccessListener(Executor { it.run() }) { onWriteSuccess() } } private fun DocumentSnapshot.toBooking(): Booking { 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 25720abc..7eb30da8 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 @@ -81,37 +81,38 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM } } - /** Queues one cancellation at a time per booking and waits for server acceptance or rejection. */ + /** + * 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. + * [BookingUiState.cancellingBookingIds] holds the booking only until the write is queued. + */ fun cancelBooking(id: String) { - val state = _uiState.value - if (id in state.cancellingBookingIds) return - if (state.bookings.any { it.id == id && it.status == BookingStatus.CANCELLED }) return + val previousStatus = _uiState.value.bookings.firstOrNull { it.id == id }?.status + if (id in _uiState.value.cancellingBookingIds || previousStatus == BookingStatus.CANCELLED) { + return + } _uiState.update { it.copy(cancellingBookingIds = it.cancellingBookingIds + id, error = null) } viewModelScope.launch { + var rejected = false try { - bookingRepository.cancelBooking( - id = id, - onWriteFailure = { exception -> - _uiState.update { - it.copy( - cancellingBookingIds = it.cancellingBookingIds - id, - error = exception.toAppError(), - ) - } - }, - onWriteSuccess = { - _uiState.update { - it.copy( - bookings = - it.bookings.map { booking -> - if (booking.id == id) booking.copy(status = BookingStatus.CANCELLED) - else booking - }, - cancellingBookingIds = it.cancellingBookingIds - id, - ) - } - }, - ) + bookingRepository.cancelBooking(id) { exception -> + rejected = true + _uiState.update { + it.copy( + bookings = it.bookings.withStatus(id, previousStatus), + cancellingBookingIds = it.cancellingBookingIds - id, + error = exception.toAppError(), + ) + } + } + if (!rejected) { + _uiState.update { + it.copy( + bookings = it.bookings.withStatus(id, BookingStatus.CANCELLED), + cancellingBookingIds = it.cancellingBookingIds - id, + ) + } + } } catch (exception: Exception) { _uiState.update { it.copy(cancellingBookingIds = it.cancellingBookingIds - id) } if (exception is CancellationException) throw exception @@ -119,4 +120,7 @@ class BookingViewModel(private val bookingRepository: BookingRepository) : ViewM } } } + + private fun List.withStatus(id: String, status: BookingStatus?): List = + if (status == null) this else map { if (it.id == id) it.copy(status = status) else it } } 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 121f7ccc..b1b88251 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 @@ -25,8 +25,9 @@ class FakeBookingRepository : BookingRepository { var loadCount = 0 var cancellationCount = 0 var cancelFailure: Exception? = null + var pendingCancel: CompletableDeferred? = null var cancelWriteFailure: ((Exception) -> Unit)? = null - var cancelWriteSuccess: (() -> Unit)? = null + var immediateCancelWriteFailure: Exception? = null override suspend fun requestBooking(booking: Booking, onWriteFailure: (Exception) -> Unit) { requestJob = currentCoroutineContext()[Job] @@ -47,14 +48,11 @@ class FakeBookingRepository : BookingRepository { return renterBookings } - override suspend fun cancelBooking( - id: String, - onWriteFailure: (Exception) -> Unit, - onWriteSuccess: () -> Unit, - ) { + override suspend fun cancelBooking(id: String, onWriteFailure: (Exception) -> Unit) { cancellationCount++ cancelWriteFailure = onWriteFailure - cancelWriteSuccess = onWriteSuccess + pendingCancel?.await() + immediateCancelWriteFailure?.let(onWriteFailure) cancelFailure?.let { throw it } } } diff --git a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt index 3972444c..2209775d 100644 --- a/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt +++ b/app/src/test/java/com/android/polybazaar/booking/model/FirebaseBookingRepositoryTest.kt @@ -219,8 +219,7 @@ class FirebaseBookingRepositoryTest { whenever(stored.getString("listingId")).thenReturn(booking.listingId) whenever(stored.getString("renterUid")).thenReturn("renter") whenever(stored.getString("lenderUid")).thenReturn(booking.lenderUid) - whenever(stored.getLong("startDate")).thenReturn(booking.startDate.toEpochDay()) - whenever(stored.getLong("endDate")).thenReturn(booking.endDate.toEpochDay()) + whenever(stored.get("days")).thenReturn(booking.days.map { it.toEpochDay() }) whenever(stored.getString("status")).thenReturn("REQUESTED") whenever(stored.id).thenReturn("booking-id") @@ -256,7 +255,7 @@ class FirebaseBookingRepositoryTest { } @Test - fun cancelBookingReportsLaterStaleOrOfflineWriteFailures() = runTest { + fun cancelBookingReportsLaterRejectedWrite() = runTest { val pendingWrite = TaskCompletionSource() whenever(document.update("status", "CANCELLED")).thenReturn(pendingWrite.task) var reportedFailure: Exception? = null @@ -272,30 +271,17 @@ class FirebaseBookingRepositoryTest { } @Test - fun cancelBookingReportsServerAcceptance() = runTest { + fun cancelBookingLogsRejectedWriteWhenCallerPassesNoCallback() = runTest { val pendingWrite = TaskCompletionSource() whenever(document.update("status", "CANCELLED")).thenReturn(pendingWrite.task) - var succeeded = false - - repository.cancelBooking("booking-id", onWriteSuccess = { succeeded = true }) - pendingWrite.setResult(null) + var logged: Exception? = null + val repository = FirebaseBookingRepository(firestore, auth) { logged = it } - assertTrue(succeeded) - } - - @Test - fun cancelBookingWithDefaultCallbacksHandlesFailureAndSuccess() = runTest { - val failedWrite = TaskCompletionSource() - val acceptedWrite = TaskCompletionSource() - whenever(document.update("status", "CANCELLED")) - .thenReturn(failedWrite.task, acceptedWrite.task) - - repository.cancelBooking("booking-id") repository.cancelBooking("booking-id") - failedWrite.setException(IllegalStateException("Write rejected")) - acceptedWrite.setResult(null) + val failure = IllegalStateException("Write rejected") + pendingWrite.setException(failure) - assertTrue(failedWrite.task.isComplete && acceptedWrite.task.isSuccessful) + assertSame(failure, logged) } @Test 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 3e6d0026..7d2a5b40 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 @@ -194,8 +194,9 @@ class BookingViewModelTest { } @Test - fun cancelBooking_preventsDuplicatesAndUpdatesBookingOnSuccess() = runTest { + fun cancelBooking_showsCancelledOnceQueuedAndPreventsDuplicates() = runTest { repository.renterBookings = listOf(booking.copy(id = "booking-id")) + repository.pendingCancel = CompletableDeferred() val viewModel = BookingViewModel(repository) viewModel.loadRenterBookings() testDispatcher.scheduler.advanceUntilIdle() @@ -207,22 +208,28 @@ class BookingViewModelTest { assertEquals(1, repository.cancellationCount) assertTrue("booking-id" in viewModel.uiState.value.cancellingBookingIds) - repository.cancelWriteSuccess?.invoke() + repository.pendingCancel?.complete(Unit) + testDispatcher.scheduler.advanceUntilIdle() assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) assertEquals(BookingStatus.CANCELLED, viewModel.uiState.value.bookings.single().status) } @Test - fun cancelBooking_exposesWriteFailureAndAllowsRetry() = runTest { + fun cancelBooking_restoresStatusAndExposesErrorWhenWriteIsRejectedLater() = runTest { + repository.renterBookings = listOf(booking.copy(id = "booking-id")) val viewModel = BookingViewModel(repository) - + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() viewModel.cancelBooking("booking-id") - testDispatcher.scheduler.runCurrent() - repository.cancelWriteFailure?.invoke(AppException(AppError.NETWORK)) + testDispatcher.scheduler.advanceUntilIdle() + assertEquals(BookingStatus.CANCELLED, viewModel.uiState.value.bookings.single().status) + + repository.cancelWriteFailure?.invoke(AppException(AppError.PERMISSION_DENIED)) + assertEquals(BookingStatus.REQUESTED, viewModel.uiState.value.bookings.single().status) + assertEquals(AppError.PERMISSION_DENIED, viewModel.uiState.value.error) assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) - assertEquals(AppError.NETWORK, viewModel.uiState.value.error) viewModel.cancelBooking("booking-id") testDispatcher.scheduler.advanceUntilIdle() @@ -230,6 +237,22 @@ class BookingViewModelTest { assertEquals(2, repository.cancellationCount) } + @Test + fun cancelBooking_keepsStatusWhenWriteFailsBeforeReturning() = runTest { + repository.renterBookings = listOf(booking.copy(id = "booking-id")) + repository.immediateCancelWriteFailure = AppException(AppError.NETWORK) + val viewModel = BookingViewModel(repository) + viewModel.loadRenterBookings() + testDispatcher.scheduler.advanceUntilIdle() + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + assertEquals(BookingStatus.REQUESTED, viewModel.uiState.value.bookings.single().status) + assertEquals(AppError.NETWORK, viewModel.uiState.value.error) + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + } + @Test fun cancelBooking_exposesLateWriteFailureAfterViewModelIsCleared() = runTest { val viewModel = BookingViewModel(repository) @@ -237,8 +260,7 @@ class BookingViewModelTest { viewModelStore.put("booking", viewModel) viewModel.cancelBooking("booking-id") - testDispatcher.scheduler.runCurrent() - assertTrue("booking-id" in viewModel.uiState.value.cancellingBookingIds) + testDispatcher.scheduler.advanceUntilIdle() viewModelStore.clear() repository.cancelWriteFailure?.invoke(AppException(AppError.NETWORK)) @@ -296,8 +318,7 @@ class BookingViewModelTest { testDispatcher.scheduler.advanceUntilIdle() viewModel.cancelBooking("booking-id") - testDispatcher.scheduler.runCurrent() - repository.cancelWriteSuccess?.invoke() + testDispatcher.scheduler.advanceUntilIdle() val bookings = viewModel.uiState.value.bookings assertEquals(BookingStatus.CANCELLED, bookings.first { it.id == "booking-id" }.status) diff --git a/rules-tests/firestore.test.js b/rules-tests/firestore.test.js index 00e2a89f..c2ab2f82 100644 --- a/rules-tests/firestore.test.js +++ b/rules-tests/firestore.test.js @@ -487,7 +487,7 @@ describe("listings", () => { await seed("bookings/b1", booking()); const ref = doc(verified(BOB), "bookings/b1"); - await assertFails(updateDoc(ref, { status: "CANCELLED", startDate: 21001 })); + await assertFails(updateDoc(ref, { status: "CANCELLED", days: [day0] })); await assertFails(updateDoc(ref, { status: "CANCELLED", extra: true })); }); });