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..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 @@ -15,4 +15,16 @@ 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 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 = {}) } 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 c7669be8..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 @@ -17,7 +17,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 { @@ -69,6 +69,39 @@ 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) { + 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) + } + } + 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..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 @@ -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,65 @@ 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 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 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) { 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 + _uiState.update { it.copy(error = exception.toAppError()) } + } + } + } + + 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 9bc0eb47..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 @@ -19,6 +19,15 @@ 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 loadCount = 0 + var cancellationCount = 0 + var cancelFailure: Exception? = null + var pendingCancel: CompletableDeferred? = null + var cancelWriteFailure: ((Exception) -> Unit)? = null + var immediateCancelWriteFailure: Exception? = null override suspend fun requestBooking(booking: Booking, onWriteFailure: (Exception) -> Unit) { requestJob = currentCoroutineContext()[Job] @@ -31,4 +40,19 @@ 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 + } + + override suspend fun cancelBooking(id: String, onWriteFailure: (Exception) -> Unit) { + cancellationCount++ + cancelWriteFailure = onWriteFailure + 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 9797aadc..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 @@ -37,6 +37,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) @@ -58,6 +59,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 @@ -208,4 +211,90 @@ 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.get("days")).thenReturn(booking.days.map { it.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 cancelBookingReportsLaterRejectedWrite() = 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", onWriteFailure = { reportedToCaller = it }) + val failure = IllegalStateException("Write rejected") + pendingWrite.setException(failure) + + assertSame(failure, reportedFailure) + assertSame(failure, reportedToCaller) + } + + @Test + fun cancelBookingLogsRejectedWriteWhenCallerPassesNoCallback() = runTest { + val pendingWrite = TaskCompletionSource() + whenever(document.update("status", "CANCELLED")).thenReturn(pendingWrite.task) + var logged: Exception? = null + val repository = FirebaseBookingRepository(firestore, auth) { logged = it } + + repository.cancelBooking("booking-id") + val failure = IllegalStateException("Write rejected") + pendingWrite.setException(failure) + + assertSame(failure, logged) + } + + @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 f01927c6..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 @@ -3,7 +3,9 @@ // Co-authored-by: Claude Code (Claude Opus 5.5) package com.android.polybazaar.booking.viewmodel +import androidx.lifecycle.ViewModelStore 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 @@ -159,4 +161,198 @@ 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_showsCancelledOnceQueuedAndPreventsDuplicates() = runTest { + repository.renterBookings = listOf(booking.copy(id = "booking-id")) + repository.pendingCancel = CompletableDeferred() + 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.pendingCancel?.complete(Unit) + testDispatcher.scheduler.advanceUntilIdle() + + assertTrue(viewModel.uiState.value.cancellingBookingIds.isEmpty()) + assertEquals(BookingStatus.CANCELLED, viewModel.uiState.value.bookings.single().status) + } + + @Test + 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.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()) + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + 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) + val viewModelStore = ViewModelStore() + viewModelStore.put("booking", viewModel) + + viewModel.cancelBooking("booking-id") + testDispatcher.scheduler.advanceUntilIdle() + + viewModelStore.clear() + repository.cancelWriteFailure?.invoke(AppException(AppError.NETWORK)) + + 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.advanceUntilIdle() + + 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) + } } diff --git a/firestore.rules b/firestore.rules index d958b011..e9a4ba70 100644 --- a/firestore.rules +++ b/firestore.rules @@ -122,7 +122,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 af14e8ca..c2ab2f82 100644 --- a/rules-tests/firestore.test.js +++ b/rules-tests/firestore.test.js @@ -450,11 +450,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", days: [day0] })); + await assertFails(updateDoc(ref, { status: "CANCELLED", extra: true })); }); });