Skip to content

CMM-2213: Attach selected site to My Site dashboard card impressions #23186

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

Draft
jkmassel wants to merge 1 commit into
base: trunk
Choose a base branch
from
+16 −2
Draft

CMM-2213: Attach selected site to My Site dashboard card impressions #23186

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
5 changes: 4 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsShownTracker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.PostCard
import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.PostCard.PostCardWithPostItems
import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.TodaysStatsCard
import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.TodaysStatsCard.TodaysStatsCardWithData
import org.wordpress.android.ui.mysite.SelectedSiteRepository
import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.BlazeSubtype
import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.StatsSubtype
import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.Type
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
import javax.inject.Inject

class CardsShownTracker @Inject constructor(
private val analyticsTrackerWrapper: AnalyticsTrackerWrapper
private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
private val selectedSiteRepository: SelectedSiteRepository
) {
private val cardsShownTracked = mutableListOf<Pair<String, String>>()

Expand Down Expand Up @@ -121,6 +123,7 @@ class CardsShownTracker @Inject constructor(
cardsShownTracked.add(pair)
analyticsTrackerWrapper.track(
Stat.MY_SITE_DASHBOARD_CARD_SHOWN,
selectedSiteRepository.getSelectedSite(),
mapOf(
CardsTracker.TYPE to pair.first,
CardsTracker.SUBTYPE to pair.second
Expand Down
13 changes: 12 additions & 1 deletion ...ss/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsShownTrackerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ import org.mockito.Mock
import org.mockito.junit.MockitoJUnitRunner
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import org.wordpress.android.analytics.AnalyticsTracker.Stat
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.ActivityCard.ActivityCardWithItems
import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.ErrorCard
import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card
import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.PostCard.PostCardWithPostItems
import org.wordpress.android.ui.mysite.SelectedSiteRepository
import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.ActivityLogSubtype
import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.PostSubtype
import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.Type
Expand All @@ -23,11 +26,17 @@ import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
class CardsShownTrackerTest {
@Mock
lateinit var analyticsTracker: AnalyticsTrackerWrapper

@Mock
lateinit var selectedSiteRepository: SelectedSiteRepository

private val site: SiteModel = mock()
private lateinit var cardsShownTracker: CardsShownTracker

@Before
fun setUp() {
cardsShownTracker = CardsShownTracker(analyticsTracker)
cardsShownTracker = CardsShownTracker(analyticsTracker, selectedSiteRepository)
whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
}

@Test
Expand All @@ -50,6 +59,7 @@ class CardsShownTrackerTest {

verify(analyticsTracker).track(
Stat.MY_SITE_DASHBOARD_CARD_SHOWN,
site,
mapOf(CardsTracker.TYPE to Type.ERROR.label, CardsTracker.SUBTYPE to Type.ERROR.label)
)
}
Expand All @@ -64,6 +74,7 @@ class CardsShownTrackerTest {
private fun verifyCardShownTracked(type: String, subtype: String) {
verify(analyticsTracker).track(
Stat.MY_SITE_DASHBOARD_CARD_SHOWN,
site,
mapOf(CardsTracker.TYPE to type, CardsTracker.SUBTYPE to subtype)
)
}
Expand Down
Loading