Merge pull request #10058 from wordpress-mobile/feature/add_tracks_to_insights_management

Add tracks to the insights management

Author: khaykov

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.store.StatsStore
 import org.wordpress.android.fluxc.store.StatsStore.InsightType
 import org.wordpress.android.fluxc.store.StatsStore.InsightType.ALL_TIME_STATS
@@ -26,6 +27,8 @@ import org.wordpress.android.ui.stats.refresh.lists.BaseListUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel.Status.ADDED
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel.Status.REMOVED
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
+import org.wordpress.android.ui.stats.refresh.utils.trackWithType
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import javax.inject.Inject
@@ -35,7 +38,8 @@ class InsightsManagementViewModel @Inject constructor(
     @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
     @Named(INSIGHTS_USE_CASE) val insightsUseCase: BaseListUseCase,
     private val siteProvider: StatsSiteProvider,
-    private val statsStore: StatsStore
+    private val statsStore: StatsStore,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper
 ) : ScopedViewModel(mainDispatcher) {
     private val _removedInsights = MutableLiveData<List<InsightModel>>()
     val removedInsights: LiveData<List<InsightModel>> = _removedInsights
@@ -76,6 +80,7 @@ class InsightsManagementViewModel @Inject constructor(
 
     fun onSaveInsights() {
         // This has to be GlobalScope because otherwise the coroutine gets killed with the ViewModel
+        analyticsTrackerWrapper.track(Stat.STATS_INSIGHTS_MANAGEMENT_SAVED)
         GlobalScope.launch {
             val addedTypes = insights.filter { it.type == ADDED }.map { it.insightType }
             statsStore.updateTypes(siteProvider.siteModel, addedTypes)
@@ -86,14 +91,17 @@ class InsightsManagementViewModel @Inject constructor(
     }
 
     fun onAddedInsightsReordered(addedInsights: List<InsightModel>) {
+        analyticsTrackerWrapper.track(Stat.STATS_INSIGHTS_MANAGEMENT_TYPE_REORDERED)
         insights = addedInsights + insights.filter { it.type == REMOVED }
         _isMenuVisible.value = true
     }
 
     fun onItemButtonClicked(insight: InsightModel) {
         if (insight.type == ADDED) {
+            analyticsTrackerWrapper.trackWithType(Stat.STATS_INSIGHTS_MANAGEMENT_TYPE_REMOVED, insight.insightType)
             insight.type = REMOVED
         } else {
+            analyticsTrackerWrapper.trackWithType(Stat.STATS_INSIGHTS_MANAGEMENT_TYPE_ADDED, insight.insightType)
             insight.type = ADDED
         }
         displayInsights()

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/ItemPopupMenuHandler.kt

@@ -9,6 +9,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.store.StatsStore
 import org.wordpress.android.fluxc.store.StatsStore.InsightType
 import org.wordpress.android.fluxc.store.StatsStore.StatsType
@@ -19,6 +20,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMe
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.DOWN
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.REMOVE
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.UP
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
 import javax.inject.Named
@@ -30,7 +32,8 @@ class ItemPopupMenuHandler
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val statsStore: StatsStore,
-    private val statsSiteProvider: StatsSiteProvider
+    private val statsSiteProvider: StatsSiteProvider,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper
 ) {
     private val mutableTypeMoved = MutableLiveData<Event<StatsType>>()
     val typeMoved: LiveData<Event<StatsType>> = mutableTypeMoved
@@ -54,19 +57,31 @@ class ItemPopupMenuHandler
                 popup.setOnItemClickListener { _, _, _, id ->
                     when (InsightsMenuItem.values()[id.toInt()]) {
                         UP -> {
+                            analyticsTrackerWrapper.trackWithType(
+                                    Stat.STATS_INSIGHTS_TYPE_MOVED_UP,
+                                    statsType
+                            )
                             GlobalScope.launch(bgDispatcher) {
                                 statsStore.moveTypeUp(statsSiteProvider.siteModel, type)
                                 mutableTypeMoved.postValue(Event(type))
                             }
                         }
                         DOWN -> {
                             GlobalScope.launch(bgDispatcher) {
+                                analyticsTrackerWrapper.trackWithType(
+                                        Stat.STATS_INSIGHTS_TYPE_MOVED_DOWN,
+                                        statsType
+                                )
                                 statsStore.moveTypeDown(statsSiteProvider.siteModel, type)
                                 mutableTypeMoved.postValue(Event(type))
                             }
                         }
                         REMOVE -> {
                             GlobalScope.launch(bgDispatcher) {
+                                analyticsTrackerWrapper.trackWithType(
+                                        Stat.STATS_INSIGHTS_TYPE_REMOVED,
+                                        statsType
+                                )
                                 statsStore.removeType(statsSiteProvider.siteModel, type)
                                 mutableTypeMoved.postValue(Event(type))
                             }

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsAnalyticsUtils.kt

@@ -6,13 +6,15 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
 import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
 import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
 import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 
 private const val GRANULARITY = "granularity"
 private const val DAYS_PROPERTY = "days"
 private const val WEEKS_PROPERTY = "weeks"
 private const val MONTHS_PROPERTY = "months"
 private const val YEARS_PROPERTY = "years"
+private const val TYPE = "type"
 
 fun AnalyticsTrackerWrapper.trackGranular(stat: Stat, granularity: StatsGranularity) {
     val property = when (granularity) {
@@ -23,3 +25,7 @@ fun AnalyticsTrackerWrapper.trackGranular(stat: Stat, granularity: StatsGranular
     }
     this.track(stat, mapOf(GRANULARITY to property))
 }
+
+fun AnalyticsTrackerWrapper.trackWithType(stat: Stat, insightType: InsightType) {
+    this.track(stat, mapOf(TYPE to insightType.name))
+}

libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java

@@ -82,6 +82,13 @@ public enum Stat {
         STATS_INSIGHTS_MANAGEMENT_HINT_DISMISSED,
         STATS_INSIGHTS_MANAGEMENT_HINT_CLICKED,
         STATS_INSIGHTS_MANAGEMENT_ACCESSED,
+        STATS_INSIGHTS_TYPE_MOVED_UP,
+        STATS_INSIGHTS_TYPE_MOVED_DOWN,
+        STATS_INSIGHTS_TYPE_REMOVED,
+        STATS_INSIGHTS_MANAGEMENT_SAVED,
+        STATS_INSIGHTS_MANAGEMENT_TYPE_ADDED,
+        STATS_INSIGHTS_MANAGEMENT_TYPE_REMOVED,
+        STATS_INSIGHTS_MANAGEMENT_TYPE_REORDERED,
         STATS_PERIOD_DAYS_ACCESSED,
         STATS_PERIOD_WEEKS_ACCESSED,
         STATS_PERIOD_MONTHS_ACCESSED,

libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

@@ -985,6 +985,20 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "stats_insights_management_hint_clicked";
             case STATS_INSIGHTS_MANAGEMENT_ACCESSED:
                 return "stats_insights_management_accessed";
+            case STATS_INSIGHTS_TYPE_MOVED_UP:
+                return "stats_insights_type_moved_up";
+            case STATS_INSIGHTS_TYPE_MOVED_DOWN:
+                return "stats_insights_type_moved_down";
+            case STATS_INSIGHTS_TYPE_REMOVED:
+                return "stats_insights_type_removed";
+            case STATS_INSIGHTS_MANAGEMENT_SAVED:
+                return "stats_insights_management_saved";
+            case STATS_INSIGHTS_MANAGEMENT_TYPE_ADDED:
+                return "stats_insights_management_type_added";
+            case STATS_INSIGHTS_MANAGEMENT_TYPE_REMOVED:
+                return "stats_insights_management_type_removed";
+            case STATS_INSIGHTS_MANAGEMENT_TYPE_REORDERED:
+                return "stats_insights_management_type_reordered";
             case STATS_PERIOD_DAYS_ACCESSED:
                 return "stats_period_accessed";
             case STATS_PERIOD_WEEKS_ACCESSED: