From dffd1bd89952a45d666a8d21d7e7287bdc7f4f46 Mon Sep 17 00:00:00 2001
From: Aleksandr Zatsepin <alexzatsepin@users.noreply.github.com>
Date: Wed, 9 Aug 2017 10:32:06 +0300
Subject: [PATCH] Mapsme 5283 1link statistics (#6823)

* [android] Added 1link statitistics for sponsored objects(viator/cian)

* [android] Added statistics for cian in search
---
 .../mapswithme/maps/search/CategoriesAdapter.java   |  7 +++++++
 .../com/mapswithme/maps/search/SearchFragment.java  |  5 +++++
 .../maps/widget/placepage/PlacePageView.java        | 10 ++++++----
 .../com/mapswithme/util/statistics/Statistics.java  | 13 +++++++++----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java
index 0f93027025..a5410c1336 100644
--- a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java
+++ b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.widget.placepage.Sponsored;
 import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.statistics.Statistics;
 
@@ -50,9 +51,15 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
       {
         // TODO: remove this code after "cian" feature is obsoleted.
         if (key.equals("cian"))
+        {
+          Statistics.INSTANCE.trackSponsoredEvent(Statistics.EventName.SEARCH_SPONSOR_CATEGORY_SHOWN,
+                                                  Sponsored.TYPE_CIAN);
           mCategoryResIds[i] = R.string.real_estate;
+        }
         else
+        {
           throw new IllegalStateException("Can't get string resource id for category:" + key);
+        }
       }
 
       String iconId = "ic_category_" + key;
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index 4b945a58fe..460688a725 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -34,6 +34,7 @@ import com.mapswithme.maps.location.LocationListener;
 import com.mapswithme.maps.routing.RoutingController;
 import com.mapswithme.maps.widget.PlaceholderView;
 import com.mapswithme.maps.widget.SearchToolbarController;
+import com.mapswithme.maps.widget.placepage.Sponsored;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.log.LoggerFactory;
@@ -588,7 +589,11 @@ public class SearchFragment extends BaseMwmFragment
   {
     mToolbarController.setQuery(category);
     if (!TextUtils.isEmpty(category) && category.equals("cian "))
+    {
+      Statistics.INSTANCE.trackSponsoredEvent(Statistics.EventName.SEARCH_SPONSOR_CATEGORY_SELECTED,
+                                              Sponsored.TYPE_CIAN);
       showAllResultsOnMap();
+    }
   }
 
   private void updateFilterButton(boolean isHotel)
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 4312c46cc3..39dd2c47c0 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -1018,14 +1018,16 @@ public class PlacePageView extends RelativeLayout
   public void onItemSelected(@NonNull String url, @Sponsored.SponsoredType int type)
   {
     Utils.openUrl(getContext(), url);
-    Statistics.INSTANCE.trackSponsoredGalleryEvent(Statistics.EventName.PP_SPONSOR_ITEM_SELECTED,
-                                                   type);
+    Statistics.INSTANCE.trackSponsoredEvent(Statistics.EventName.PP_SPONSOR_ITEM_SELECTED,
+                                            type);
   }
 
   @Override
   public void onMoreItemSelected(@NonNull String url, @Sponsored.SponsoredType int type)
   {
     Utils.openUrl(getContext(), url);
+    Statistics.INSTANCE.trackSponsoredEvent(Statistics.EventName.PP_SPONSOR_MORE_SELECTED,
+                                            type);
   }
 
   @Override
@@ -1985,8 +1987,8 @@ public class PlacePageView extends RelativeLayout
         if (!TextUtils.isEmpty(url))
         {
           Utils.openUrl(getContext(), url);
-          Statistics.INSTANCE.trackSponsoredGalleryEvent(Statistics.EventName.PP_SPONSOR_LOGO_SELECTED,
-                                                         mSponsored.getType());
+          Statistics.INSTANCE.trackSponsoredEvent(Statistics.EventName.PP_SPONSOR_LOGO_SELECTED,
+                                                  mSponsored.getType());
         }
         break;
     }
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index aeb1f172f3..c066e1fceb 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -133,6 +133,8 @@ public enum Statistics
     public static final String SEARCH_ON_MAP_CLICKED = "Search. View on map clicked.";
     public static final String SEARCH_CANCEL = "Search. Cancel.";
     public static final String SEARCH_TAB_SELECTED = "Search_Tab_selected";
+    public static final String SEARCH_SPONSOR_CATEGORY_SHOWN = "Search_SponsoredCategory_shown";
+    public static final String SEARCH_SPONSOR_CATEGORY_SELECTED = "Search_SponsoredCategory_selected";
 
     // place page
     public static final String PP_OPEN = "PP. Open";
@@ -746,7 +748,9 @@ public enum Statistics
 
   public void trackSponsoredGalleryShown(@Sponsored.SponsoredType int type)
   {
-    trackEvent(PP_SPONSORED_SHOWN, Statistics.params().add(PROVIDER, convertToSponsor(type)).get());
+    String provider = convertToSponsor(type);
+    trackEvent(PP_SPONSORED_SHOWN, Statistics.params().add(PROVIDER, provider).get());
+    MyTracker.trackEvent(PP_SPONSORED_SHOWN + "_" + provider);
   }
 
   public void trackSponsoredGalleryError(@Sponsored.SponsoredType int type, String errorCode)
@@ -755,10 +759,11 @@ public enum Statistics
                                              .add(ERROR, errorCode).get());
   }
 
-  public void trackSponsoredGalleryEvent(@NonNull String eventName,
-                                         @Sponsored.SponsoredType int type)
+  public void trackSponsoredEvent(@NonNull String eventName, @Sponsored.SponsoredType int type)
   {
-    trackEvent(eventName, Statistics.params().add(PROVIDER, convertToSponsor(type)).get());
+    String provider = convertToSponsor(type);
+    trackEvent(eventName, Statistics.params().add(PROVIDER, provider).get());
+    MyTracker.trackEvent(eventName + "_" + provider);
   }
 
   @NonNull