Skip to content

Fix: update blog count in pill on site block #23290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coderGtm wants to merge 1 commit into
base: trunk
Choose a base branch
from
+92 −0
Open

Fix: update blog count in pill on site block #23290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions ...ss/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.wordpress.android.models.ReaderPost
import org.wordpress.android.modules.BG_THREAD
import org.wordpress.android.ui.pages.SnackbarMessageHolder
import org.wordpress.android.ui.prefs.AppPrefsWrapper
import org.wordpress.android.ui.reader.ReaderEvents
import org.wordpress.android.ui.reader.comments.ThreadedCommentsActionSource
import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState.ReaderRecommendedBlogUiState
import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.SharePost
Expand Down Expand Up @@ -79,6 +80,7 @@ import org.wordpress.android.ui.utils.UiString.UiStringRes
import org.wordpress.android.ui.utils.UiString.UiStringText
import org.wordpress.android.util.AppLog
import org.wordpress.android.util.AppLog.T
import org.wordpress.android.util.EventBusWrapper
import org.wordpress.android.viewmodel.Event
import org.wordpress.android.viewmodel.ResourceProvider
import org.wordpress.android.widgets.AppReviewsManagerWrapper
Expand All @@ -104,6 +106,7 @@ class ReaderPostCardActionsHandler @Inject constructor(
private val seenStatusToggleUseCase: ReaderSeenStatusToggleUseCase,
private val readerBlogTableWrapper: ReaderBlogTableWrapper,
private val accountStore: AccountStore,
private val eventBusWrapper: EventBusWrapper,
@Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
) {
private lateinit var coroutineScope: CoroutineScope
Expand Down Expand Up @@ -438,6 +441,7 @@ class ReaderPostCardActionsHandler @Inject constructor(
when (it) {
is BlockSiteState.SiteBlockedInLocalDb -> {
_refreshPosts.postValue(Event(Unit))
notifyFollowedBlogsChanged()
updateBlockedStateFunction?.let { func -> func(true) }
_snackbarEvents.postValue(
Event(
Expand All @@ -449,6 +453,7 @@ class ReaderPostCardActionsHandler @Inject constructor(
val blogId = it.blockedBlogData.blogId
undoBlockBlogUseCase.undoBlockBlog(it.blockedBlogData, source)
_refreshPosts.postValue(Event(Unit))
notifyFollowedBlogsChanged()
_scrollToSiteId.emit(blogId)
_snackbarEvents.postValue(
Event(
Expand All @@ -472,6 +477,7 @@ class ReaderPostCardActionsHandler @Inject constructor(
}
BlockSiteState.Failed.RequestFailed -> {
_refreshPosts.postValue(Event(Unit))
notifyFollowedBlogsChanged()
_snackbarEvents.postValue(
Event(SnackbarMessageHolder(UiStringRes(R.string.reader_toast_err_unable_to_block_blog)))
)
Expand All @@ -481,6 +487,17 @@ class ReaderPostCardActionsHandler @Inject constructor(
}
}

private fun notifyFollowedBlogsChanged() {
eventBusWrapper.post(
ReaderEvents.FollowedBlogsFetched(
getFollowedBlogsCount(),
true
)
)
}

private fun getFollowedBlogsCount(): Int = readerBlogTableWrapper.getFollowedBlogs().size

private suspend fun handleBlockUserClicked(
authorId: Long,
feedId: Long,
Expand Down
75 changes: 75 additions & 0 deletions ...rc/test/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import org.mockito.junit.MockitoJUnitRunner
import org.mockito.kotlin.any
import org.mockito.kotlin.anyOrNull
import org.mockito.kotlin.anyVararg
import org.mockito.kotlin.argumentCaptor
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.times
Expand All @@ -26,6 +27,7 @@ import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPay
import org.wordpress.android.models.ReaderPost
import org.wordpress.android.ui.pages.SnackbarMessageHolder
import org.wordpress.android.ui.prefs.AppPrefsWrapper
import org.wordpress.android.ui.reader.ReaderEvents.FollowedBlogsFetched
import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenEditorForReblog
import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.SharePost
import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowBlogPreview
Expand Down Expand Up @@ -79,6 +81,7 @@ import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSi
import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase
import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState
import org.wordpress.android.ui.utils.HtmlMessageUtils
import org.wordpress.android.util.EventBusWrapper
import org.wordpress.android.viewmodel.ResourceProvider

private const val SOURCE = "source"
Expand Down Expand Up @@ -134,6 +137,9 @@ class ReaderPostCardActionsHandlerTest : BaseUnitTest() {
@Mock
private lateinit var accountStore: AccountStore

@Mock
private lateinit var eventBusWrapper: EventBusWrapper

@Mock
private lateinit var resourceProvider: ResourceProvider

Expand Down Expand Up @@ -161,6 +167,7 @@ class ReaderPostCardActionsHandlerTest : BaseUnitTest() {
seenStatusToggleUseCase,
readerBlogTableWrapper,
accountStore,
eventBusWrapper,
testDispatcher()
)
actionHandler.initScope(testScope())
Expand Down Expand Up @@ -740,6 +747,52 @@ class ReaderPostCardActionsHandlerTest : BaseUnitTest() {
assertThat(observedValues.refreshPosts.size).isEqualTo(1)
}

@Test
fun `FollowedBlogsFetched event is posted with new count when site blocked in local db`() = test {
// Arrange
whenever(blockBlogUseCase.blockBlog(any(), any()))
.thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
whenever(readerBlogTableWrapper.getFollowedBlogs())
.thenReturn(listOf(mock(), mock()))
// Act
actionHandler.onAction(
mock(),
BLOCK_SITE,
false,
SOURCE
)

// Assert
val captor = argumentCaptor<Any>()
verify(eventBusWrapper).post(captor.capture())
val event = captor.firstValue as FollowedBlogsFetched
assertThat(event.getTotalSubscriptions()).isEqualTo(2)
assertThat(event.didChange()).isTrue()
}

@Test
fun `FollowedBlogsFetched event is posted when user clicks on undo action in snackbar`() = test {
// Arrange
whenever(blockBlogUseCase.blockBlog(any(), any()))
.thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
whenever(readerBlogTableWrapper.getFollowedBlogs()).thenReturn(emptyList())
val observedValues = startObserving(backgroundScope)
actionHandler.onAction(
mock(),
BLOCK_SITE,
false,
SOURCE
)
// Act
observedValues.snackbarMsgs[0].buttonAction.invoke()
// Assert
val captor = argumentCaptor<Any>()
verify(eventBusWrapper, times(2)).post(captor.capture())
val events = captor.allValues.map { it as FollowedBlogsFetched }
assertThat(events)
.allMatch { it.didChange() && it.getTotalSubscriptions() == 0 }
}

@Test
fun `Snackbar shown when site blocked in local db`() = test {
// Arrange
Expand Down Expand Up @@ -794,6 +847,28 @@ class ReaderPostCardActionsHandlerTest : BaseUnitTest() {
assertThat(observedValues.refreshPosts.size).isEqualTo(1)
}

@Test
fun `FollowedBlogsFetched event is posted when request to block site fails with request failed error`() = test {
// Arrange
whenever(blockBlogUseCase.blockBlog(any(), any()))
.thenReturn(flowOf(Failed.RequestFailed))
whenever(readerBlogTableWrapper.getFollowedBlogs()).thenReturn(emptyList())
// Act
actionHandler.onAction(
mock(),
BLOCK_SITE,
false,
SOURCE
)

// Assert
val captor = argumentCaptor<Any>()
verify(eventBusWrapper).post(captor.capture())
val event = captor.firstValue as FollowedBlogsFetched
assertThat(event.getTotalSubscriptions()).isZero()
assertThat(event.didChange()).isTrue()
}

@Test
fun `Snackbar shown when request to block site failes with request failed error`() = test {
// Arrange
Expand Down