Align connectivity tool analytics with iOS

Use dedicated constants with "connectivity_" prefix matching iOS values:
- Property key: "test" instead of "type"
- WP.com value: "wpCom" instead of "wp_com"
- Orders value: "orders" instead of "jetpack_tunnel"
- Internet/site/products values already matched

Author: hichamboushaba

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

@@ -408,9 +408,11 @@ class AnalyticsTracker private constructor(
         const val KEY_DOWNLOADABLE_FILE_ACTION = "action"
 
         // -- Connectivity Tool
-        const val VALUE_INTERNET = "internet"
-        const val VALUE_SITE = "site"
-        const val VALUE_JETPACK_TUNNEL = "jetpack_tunnel"
+        const val KEY_CONNECTIVITY_TEST = "test"
+        const val VALUE_CONNECTIVITY_INTERNET = "internet"
+        const val VALUE_CONNECTIVITY_WP_COM = "wpCom"
+        const val VALUE_CONNECTIVITY_SITE = "site"
+        const val VALUE_CONNECTIVITY_ORDERS = "orders"
         const val VALUE_CONNECTIVITY_PRODUCTS = "products"
 
         enum class DownloadableFileAction(val value: String) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/connectivitytool/ConnectivityToolViewModel.kt

@@ -5,10 +5,12 @@ import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
-import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_INTERNET
-import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_JETPACK_TUNNEL
-import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_SITE
-import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_WP_COM
+import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_CONNECTIVITY_TEST
+import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_CONNECTIVITY_ORDERS
+import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_CONNECTIVITY_PRODUCTS
+import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_CONNECTIVITY_WP_COM
+import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_CONNECTIVITY_INTERNET
+import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_CONNECTIVITY_SITE
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.tools.SiteConnectionType
@@ -175,7 +177,7 @@ class ConnectivityToolViewModel @Inject constructor(
     private fun startInternetCheck() {
         val startTime = System.currentTimeMillis()
         internetConnectionCheck().onEach { status ->
-            trackChanges(status, VALUE_INTERNET, startTime)
+            trackChanges(status, VALUE_CONNECTIVITY_INTERNET, startTime)
             status.startNextCheck()
             internetCheckFlow.update { it.copy(connectivityCheckStatus = status) }
         }.launchIn(viewModelScope)
@@ -184,7 +186,7 @@ class ConnectivityToolViewModel @Inject constructor(
     private fun startWordPressCheck() {
         val startTime = System.currentTimeMillis()
         wordPressConnectionCheck().onEach { status ->
-            trackChanges(status, VALUE_WP_COM, startTime)
+            trackChanges(status, VALUE_CONNECTIVITY_WP_COM, startTime)
             status.startNextCheck()
             wordpressCheckFlow.update { it.copy(connectivityCheckStatus = status) }
         }.launchIn(viewModelScope)
@@ -193,7 +195,7 @@ class ConnectivityToolViewModel @Inject constructor(
     private fun startStoreCheck() {
         val startTime = System.currentTimeMillis()
         storeConnectionCheck().onEach { status ->
-            trackChanges(status, VALUE_SITE, startTime)
+            trackChanges(status, VALUE_CONNECTIVITY_SITE, startTime)
             status.startNextCheck()
             storeCheckFlow.update {
                 if (status is Failure) {
@@ -211,7 +213,7 @@ class ConnectivityToolViewModel @Inject constructor(
     private fun startStoreOrdersCheck() {
         val startTime = System.currentTimeMillis()
         storeOrdersCheck().onEach { status ->
-            trackChanges(status, VALUE_JETPACK_TUNNEL, startTime)
+            trackChanges(status, VALUE_CONNECTIVITY_ORDERS, startTime)
             status.startNextCheck()
             ordersCheckFlow.update {
                 if (status is Failure) {
@@ -229,7 +231,7 @@ class ConnectivityToolViewModel @Inject constructor(
     private fun startProductsCheck() {
         val startTime = System.currentTimeMillis()
         storeProductsCheck().onEach { status ->
-            trackChanges(status, AnalyticsTracker.VALUE_CONNECTIVITY_PRODUCTS, startTime)
+            trackChanges(status, VALUE_CONNECTIVITY_PRODUCTS, startTime)
             status.startNextCheck()
             productsCheckFlow.update {
                 if (status is Failure) {
@@ -267,7 +269,7 @@ class ConnectivityToolViewModel @Inject constructor(
             AnalyticsEvent.CONNECTIVITY_TOOL_REQUEST_RESPONSE,
             mapOf(
                 AnalyticsTracker.KEY_SUCCESS to (status is Success),
-                AnalyticsTracker.KEY_TYPE to type,
+                KEY_CONNECTIVITY_TEST to type,
                 AnalyticsTracker.KEY_TIME_TAKEN to (System.currentTimeMillis() - startTime)
             )
         )

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/connectivitytool/useCases/StoreProductsCheckUseCaseTest.kt

@@ -55,7 +55,7 @@ class StoreProductsCheckUseCaseTest : BaseUnitTest() {
     fun `when fetchProducts returns GENERIC_ERROR, then emit GENERIC Failure`() = testBlocking {
         // GIVEN
         val stateEvents = mutableListOf<ConnectivityCheckStatus>()
-        whenever(productStore.fetchProducts(selectedSite.get()))
+        whenever(productStore.fetchProducts(site = selectedSite.get(), forceRefresh = true))
             .thenReturn(WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN)))
 
         // WHEN
@@ -71,7 +71,7 @@ class StoreProductsCheckUseCaseTest : BaseUnitTest() {
     fun `when fetchProducts returns TIMEOUT, then emit TIMEOUT Failure`() = testBlocking {
         // GIVEN
         val stateEvents = mutableListOf<ConnectivityCheckStatus>()
-        whenever(productStore.fetchProducts(selectedSite.get()))
+        whenever(productStore.fetchProducts(site = selectedSite.get(), forceRefresh = true))
             .thenReturn(WooResult(WooError(WooErrorType.TIMEOUT, UNKNOWN)))
 
         // WHEN
@@ -87,7 +87,7 @@ class StoreProductsCheckUseCaseTest : BaseUnitTest() {
     fun `when fetchProducts returns INVALID_RESPONSE, then emit PARSE Failure`() = testBlocking {
         // GIVEN
         val stateEvents = mutableListOf<ConnectivityCheckStatus>()
-        whenever(productStore.fetchProducts(selectedSite.get()))
+        whenever(productStore.fetchProducts(site = selectedSite.get(), forceRefresh = true))
             .thenReturn(WooResult(WooError(WooErrorType.INVALID_RESPONSE, UNKNOWN)))
 
         // WHEN
@@ -103,7 +103,7 @@ class StoreProductsCheckUseCaseTest : BaseUnitTest() {
     fun `when fetchProducts returns API_NOT_FOUND, then emit JETPACK Failure`() = testBlocking {
         // GIVEN
         val stateEvents = mutableListOf<ConnectivityCheckStatus>()
-        whenever(productStore.fetchProducts(selectedSite.get()))
+        whenever(productStore.fetchProducts(site = selectedSite.get(), forceRefresh = true))
             .thenReturn(WooResult(WooError(WooErrorType.API_NOT_FOUND, UNKNOWN)))
 
         // WHEN