Merge pull request #8172 from woocommerce/feature/tracking_profiler_steps

Feature/tracking profiler steps

Author: JorgeMucientes

RELEASE-NOTES.txt

@@ -1,9 +1,11 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 11.9
 -----
-
+- [**] Adds new profiler steps to store creation flow [https://github.com/woocommerce/woocommerce-android/pull/8097]
+- [**] Adds country picker step to store creation flow [https://github.com/woocommerce/woocommerce-android/pull/8167]
 
 11.8
+-----
 - [*] Add variations bottom sheet is fully visible right after showing up in the landscape mode [https://github.com/woocommerce/woocommerce-android/pull/8043]
 - [*] UI improvements to the products on the analytics screen [https://github.com/woocommerce/woocommerce-android/pull/8098]
 - [*] Add a feature of replying to customer reviews [https://github.com/woocommerce/woocommerce-android/pull/8045]

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

@@ -779,6 +779,7 @@ enum class AnalyticsEvent(val siteless: Boolean = false) {
     SITE_CREATION_IAP_ELIGIBILITY_ERROR(siteless = true),
     SITE_CREATION_IAP_PURCHASE_SUCCESS(siteless = true),
     SITE_CREATION_IAP_PURCHASE_ERROR(siteless = true),
+    SITE_CREATION_PROFILER_DATA,
 
     APPLICATION_PASSWORDS_NEW_PASSWORD_CREATED,
     APPLICATION_PASSWORDS_NOT_AVAILABLE,

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt

@@ -189,6 +189,11 @@ class AnalyticsTracker private constructor(private val context: Context) {
         const val KEY_CUSTOM_FIELDS_SIZE = "custom_fields_size"
         const val KEY_WAITING_TIME = "waiting_time"
         const val KEY_IS_NON_ATOMIC = "is_non_atomic"
+        const val KEY_INDUSTRY_GROUP = "industry_group"
+        const val KEY_INDUSTRY = "industry"
+        const val KEY_USER_COMMERCE_JOURNEY = "user_commerce_journey"
+        const val KEY_ECOMMERCE_PLATFORMS = "ecommerce_platforms"
+        const val KEY_COUNTRY_CODE = "country_code"
 
         const val KEY_SORT_ORDER = "order"
         const val VALUE_SORT_NAME_ASC = "name,ascending"

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/NewStore.kt

@@ -11,9 +11,7 @@ class NewStore @Inject constructor() {
     fun update(
         name: String? = null,
         domain: String? = null,
-        industry: String? = null,
-        commerceJourney: String? = null,
-        eCommercePlatform: String? = null,
+        profilerData: ProfilerData? = null,
         country: Country? = null,
         siteId: Long? = null,
         planProductId: Int? = null,
@@ -22,9 +20,7 @@ class NewStore @Inject constructor() {
         data = data.copy(
             name = name ?: data.name,
             domain = domain ?: data.domain,
-            industry = industry ?: data.industry,
-            userJourney = commerceJourney ?: data.userJourney,
-            platform = eCommercePlatform ?: data.platform,
+            profilerData = profilerData ?: data.profilerData,
             country = country ?: data.country,
             siteId = siteId ?: data.siteId,
             planProductId = planProductId ?: data.planProductId,
@@ -39,9 +35,7 @@ class NewStore @Inject constructor() {
     data class NewStoreData(
         val name: String? = null,
         val domain: String? = null,
-        val industry: String? = null,
-        val userJourney: String? = null,
-        val platform: String? = null,
+        val profilerData: ProfilerData? = null,
         val country: Country? = null,
         val siteId: Long? = null,
         val planProductId: Int? = null,
@@ -52,4 +46,12 @@ class NewStore @Inject constructor() {
         val name: String,
         val code: String,
     )
+
+    data class ProfilerData(
+        val industryLabel: String? = null,
+        val industryKey: String? = null,
+        val industryGroupKey: String? = null,
+        val userCommerceJourneyKey: String? = null,
+        val eCommercePlatformKey: String? = null,
+    )
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/mystoresummary/MyStoreSummaryViewModel.kt

@@ -26,7 +26,7 @@ class MyStoreSummaryViewModel @Inject constructor(
         MyStoreSummaryState(
             name = newStore.data.name,
             domain = newStore.data.domain ?: "",
-            industry = newStore.data.industry,
+            industry = newStore.data.profilerData?.industryLabel,
             country = Country(
                 name = newStore.data.country?.name ?: "",
                 emojiFlag = emojiUtils.countryCodeToEmojiFlag(newStore.data.country?.code ?: "")
@@ -41,6 +41,18 @@ class MyStoreSummaryViewModel @Inject constructor(
                 AnalyticsTracker.KEY_STEP to AnalyticsTracker.VALUE_STEP_STORE_SUMMARY
             )
         )
+
+        val newStoreProfilerData = newStore.data.profilerData
+        analyticsTrackerWrapper.track(
+            stat = AnalyticsEvent.SITE_CREATION_PROFILER_DATA,
+            properties = mapOf(
+                AnalyticsTracker.KEY_INDUSTRY_GROUP to newStoreProfilerData?.industryGroupKey,
+                AnalyticsTracker.KEY_INDUSTRY to newStoreProfilerData?.industryKey,
+                AnalyticsTracker.KEY_USER_COMMERCE_JOURNEY to newStoreProfilerData?.userCommerceJourneyKey,
+                AnalyticsTracker.KEY_ECOMMERCE_PLATFORMS to newStoreProfilerData?.eCommercePlatformKey,
+                AnalyticsTracker.KEY_COUNTRY_CODE to newStore.data.country?.code,
+            )
+        )
     }
 
     fun onBackPressed() {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/name/StoreNamePickerFragment.kt

@@ -13,7 +13,6 @@ import com.woocommerce.android.extensions.navigateToHelpScreen
 import com.woocommerce.android.ui.base.BaseFragment
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import com.woocommerce.android.ui.main.AppBarStatus
-import com.woocommerce.android.util.FeatureFlag
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -51,11 +50,8 @@ class StoreNamePickerFragment : BaseFragment() {
     }
 
     private fun navigateToStoreProfilerCategoryFragment() {
-        val directions = if (FeatureFlag.STORE_PROFILER_FLOW.isEnabled()) {
+        findNavController().navigateSafely(
             StoreNamePickerFragmentDirections.actionStoreNamePickerFragmentToStoreProfilerCategoryFragment()
-        } else {
-            StoreNamePickerFragmentDirections.actionStoreNamePickerFragmentToDomainPickerFragment()
-        }
-        findNavController().navigateSafely(directions)
+        )
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/profiler/BaseStoreProfilerViewModel.kt

@@ -75,6 +75,7 @@ abstract class BaseStoreProfilerViewModel(
     @Parcelize
     data class StoreProfilerOptionUi(
         val name: String,
+        val key: String,
         val isSelected: Boolean,
     ) : Parcelable
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/profiler/ProfilerOptionsModel.kt

@@ -10,7 +10,8 @@ data class AboutMerchant(
     val value: String,
     val heading: String,
     val description: String,
-    val platforms: List<Platform>?
+    val tracks: String,
+    val platforms: List<Platform>?,
 )
 
 data class Platform(
@@ -21,5 +22,6 @@ data class Platform(
 data class Industry(
     val id: String,
     val label: String,
-    val key: String
+    val key: String,
+    val tracks: String
 )

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/profiler/StoreProfilerCommerceJourneyViewModel.kt

@@ -47,7 +47,12 @@ class StoreProfilerCommerceJourneyViewModel @Inject constructor(
         resourceProvider.getString(R.string.store_creation_store_profiler_journey_title)
 
     override fun onContinueClicked() {
-        newStore.update(commerceJourney = profilerOptions.value.firstOrNull() { it.isSelected }?.name)
+        newStore.update(
+            profilerData = (newStore.data.profilerData ?: NewStore.ProfilerData())
+                .copy(
+                    userCommerceJourneyKey = profilerOptions.value.firstOrNull { it.isSelected }?.key
+                )
+        )
         when (alreadySellingOnlineSelected()) {
             true -> triggerEvent(NavigateToEcommercePlatformsStep)
             false -> triggerEvent(NavigateToCountryPickerStep)
@@ -56,7 +61,8 @@ class StoreProfilerCommerceJourneyViewModel @Inject constructor(
 
     private fun AboutMerchant.toStoreProfilerOptionUi() = StoreProfilerOptionUi(
         name = value,
-        isSelected = newStore.data.industry == value,
+        key = tracks,
+        isSelected = newStore.data.profilerData?.eCommercePlatformKey == tracks,
     )
 
     private fun alreadySellingOnlineSelected() = profilerOptions.value

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/profiler/StoreProfilerEcommercePlatformsViewModel.kt

@@ -41,7 +41,8 @@ class StoreProfilerEcommercePlatformsViewModel @Inject constructor(
     private fun Platform.toStoreProfilerOptionUi() =
         StoreProfilerOptionUi(
             name = label,
-            isSelected = newStore.data.industry == label
+            key = value,
+            isSelected = newStore.data.profilerData?.eCommercePlatformKey == value
         )
 
     override fun getProfilerStepDescription(): String =
@@ -51,7 +52,12 @@ class StoreProfilerEcommercePlatformsViewModel @Inject constructor(
         resourceProvider.getString(R.string.store_creation_store_profiler_platforms_title)
 
     override fun onContinueClicked() {
-        newStore.update(eCommercePlatform = profilerOptions.value.firstOrNull() { it.isSelected }?.name)
+        newStore.update(
+            profilerData = (newStore.data.profilerData ?: NewStore.ProfilerData())
+                .copy(
+                    eCommercePlatformKey = profilerOptions.value.firstOrNull { it.isSelected }?.key
+                )
+        )
         triggerEvent(NavigateToCountryPickerStep)
     }
 }