Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class HomeViewModel(
errorMessage = null,
)
}
val result = runCatching { repository.loadFeed(page = 1) }
val result = runCatching { loadRefreshFeed() }
result.exceptionOrNull()?.let { if (it is CancellationException) throw it }
if (generation != requestGeneration) return@launch
if (showsRefreshIndicator) {
Expand Down Expand Up @@ -125,6 +125,16 @@ class HomeViewModel(
}
}

private suspend fun loadRefreshFeed(): HomeFeedPage {
val firstPage = repository.loadFeed(page = 1)
if (!firstPage.hasMore) return firstPage

val secondPage = repository.loadFeed(page = firstPage.currentPage + 1)
return secondPage.copy(
threads = mergeThreads(firstPage.threads, secondPage.threads),
)
}

fun loadMore() {
val snapshot = _uiState.value
if (snapshot.isBusy || !snapshot.hasMore) return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,67 @@ class HomeViewModelTest {
advanceUntilIdle()
}

@Test
fun refreshLoadsTwoPagesAndContinuesPaginationAfterBoth() = runTest(dispatcher) {
val repository = ControllableHomeRepository()
val viewModel = HomeViewModel(repository)
runCurrent()

repository.calls.single().result.complete(homePage(threadId = 1, hasMore = true))
runCurrent()
assertEquals(listOf(1, 2), repository.calls.map(ControllableHomeRepository.Call::page))

repository.calls.last().result.complete(homePage(threadId = 2, currentPage = 2, hasMore = true))
advanceUntilIdle()

assertEquals(listOf(1L, 2L), viewModel.uiState.value.threads.map(ThreadSummary::id))
assertEquals(3, viewModel.uiState.value.nextPage)

viewModel.loadMore()
runCurrent()

assertEquals(listOf(1, 2, 3), repository.calls.map(ControllableHomeRepository.Call::page))
repository.calls.last().result.complete(homePage(threadId = 3, currentPage = 3, hasMore = false))
advanceUntilIdle()
}

@Test
fun secondRefreshPageFailureKeepsCachedThreadsAndRetriesBothPages() = runTest(dispatcher) {
val repository = ControllableHomeRepository()
val viewModel = HomeViewModel(repository)
runCurrent()
repository.calls.single().result.complete(homePage(threadId = 1, hasMore = false))
advanceUntilIdle()

viewModel.refresh()
runCurrent()
repository.calls.last().result.complete(homePage(threadId = 2, hasMore = true))
runCurrent()
repository.calls.last().result.completeExceptionally(IllegalStateException("second page failed"))
advanceUntilIdle()

assertEquals(listOf(1L), viewModel.uiState.value.threads.map(ThreadSummary::id))
assertEquals("second page failed", viewModel.uiState.value.errorMessage)

viewModel.retry()
runCurrent()
repository.calls.last().result.complete(homePage(threadId = 2, hasMore = true))
runCurrent()
repository.calls.last().result.complete(homePage(threadId = 3, currentPage = 2, hasMore = false))
advanceUntilIdle()

assertEquals(listOf(2L, 3L, 1L), viewModel.uiState.value.threads.map(ThreadSummary::id))
assertEquals(listOf(1, 1, 2, 1, 2), repository.calls.map(ControllableHomeRepository.Call::page))
}

@Test
fun retryRepeatsFailedPaginationPage() = runTest(dispatcher) {
val repository = ControllableHomeRepository()
val viewModel = HomeViewModel(repository)
runCurrent()
repository.calls.single().result.complete(homePage(threadId = 1, hasMore = true))
runCurrent()
repository.calls.last().result.complete(homePage(threadId = 2, currentPage = 2, hasMore = true))
advanceUntilIdle()

viewModel.loadMore()
Expand All @@ -68,8 +123,8 @@ class HomeViewModelTest {
viewModel.retry()
runCurrent()

assertEquals(listOf(1, 2, 2), repository.calls.map(ControllableHomeRepository.Call::page))
repository.calls.last().result.complete(homePage(threadId = 2, currentPage = 2, hasMore = false))
assertEquals(listOf(1, 2, 3, 3), repository.calls.map(ControllableHomeRepository.Call::page))
repository.calls.last().result.complete(homePage(threadId = 3, currentPage = 3, hasMore = false))
advanceUntilIdle()
}
}
Expand Down