From a6e0e1e167c6cd10dffdd5912406a8ce03049fba Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Tue, 3 Sep 2019 13:45:02 +0300
Subject: [PATCH] [statistics] Review fixes.

---
 .../maps/bookmarks/BookmarksListFragment.java | 10 ++---
 .../ChooseBookmarksSortingTypeFragment.java   | 23 ++---------
 .../util/statistics/Statistics.java           | 41 +++++++++++++++++--
 search/processor.cpp                          | 12 +++---
 4 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index f446c1c13a..4e960e43fe 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -715,19 +715,19 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
     UgcRouteSharingOptionsActivity.startForResult(requireActivity(), mCategoryDataSource.getData());
   }
 
-  private void trackBookmarkListSharingOptions()
+  private static void trackBookmarkListSharingOptions()
   {
     Statistics.INSTANCE.trackBookmarkListSharingOptions();
   }
 
-  private void trackBookmarksSearch()
+  private static void trackBookmarksSearch()
   {
-    Statistics.INSTANCE.trackBookmarksSearch(Statistics.ParamValue.BOOKMARKS_LIST);
+    Statistics.INSTANCE.trackBookmarksListSearch();
   }
 
-  private void trackBookmarksSearchResultSelected()
+  private static void trackBookmarksSearchResultSelected()
   {
-    Statistics.INSTANCE.trackBookmarksSearchResultSelected(Statistics.ParamValue.BOOKMARKS_LIST);
+    Statistics.INSTANCE.trackBookmarksListSearchResultSelected();
   }
 
   @SuppressWarnings("ConstantConditions")
diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java
index 1f7900725d..8d137b29e6 100644
--- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -162,28 +162,13 @@ public class ChooseBookmarksSortingTypeFragment extends BaseMwmDialogFragment
     }
   }
 
-  @NonNull
-  private String getStatisticsSortingType(@BookmarkManager.SortingType int sortingType)
+  private static void trackBookmarksListSort(@BookmarkManager.SortingType int sortingType)
   {
-    switch (sortingType)
-    {
-      case BookmarkManager.SORT_BY_TYPE:
-        return Statistics.ParamValue.BY_TYPE;
-      case BookmarkManager.SORT_BY_DISTANCE:
-        return Statistics.ParamValue.BY_DISTANCE;
-      case BookmarkManager.SORT_BY_TIME:
-        return Statistics.ParamValue.BY_DATE;
-    }
-    throw new AssertionError("Invalid sorting type");
+    Statistics.INSTANCE.trackBookmarksListSort(sortingType);
   }
 
-  private void trackBookmarksListSort(@BookmarkManager.SortingType int sortingType)
+  private static void trackBookmarksListResetSort()
   {
-    Statistics.INSTANCE.trackBookmarksListSort(getStatisticsSortingType(sortingType));
-  }
-
-  private void trackBookmarksListResetSort()
-  {
-    Statistics.INSTANCE.trackBookmarksListSort(Statistics.ParamValue.BY_DEFAULT);
+    Statistics.INSTANCE.trackBookmarksListResetSort();
   }
 }
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index 3b42e5ca24..5e4b6f9fc3 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -211,19 +211,54 @@ public enum Statistics
     trackEvent(EventName.BM_BOOKMARKS_LIST_SETTINGS_CLICK, builder);
   }
 
-  public void trackBookmarksListSort(@NonNull String value)
+  @NonNull
+  private static String getStatisticsSortingType(@BookmarkManager.SortingType int sortingType)
+  {
+    switch (sortingType)
+    {
+      case BookmarkManager.SORT_BY_TYPE:
+        return Statistics.ParamValue.BY_TYPE;
+      case BookmarkManager.SORT_BY_DISTANCE:
+        return Statistics.ParamValue.BY_DISTANCE;
+      case BookmarkManager.SORT_BY_TIME:
+        return Statistics.ParamValue.BY_DATE;
+    }
+    throw new AssertionError("Invalid sorting type");
+  }
+
+  public void trackBookmarksListSort(@BookmarkManager.SortingType int sortingType)
+  {
+    trackBookmarksListSort(getStatisticsSortingType(sortingType));
+  }
+
+  public void trackBookmarksListResetSort()
+  {
+    trackBookmarksListSort(Statistics.ParamValue.BY_DEFAULT);
+  }
+
+  private void trackBookmarksListSort(@NonNull String value)
   {
     ParameterBuilder builder = new ParameterBuilder().add(EventParam.OPTION, value);
     trackEvent(EventName.BM_BOOKMARKS_LIST_SORT, builder);
   }
 
-  public void trackBookmarksSearch(@NonNull String value)
+  public void trackBookmarksListSearch()
+  {
+    trackBookmarksSearch(ParamValue.BOOKMARKS_LIST);
+  }
+
+  private void trackBookmarksSearch(@NonNull String value)
   {
     ParameterBuilder builder = new ParameterBuilder().add(EventParam.FROM, value);
     trackEvent(EventName.BM_BOOKMARKS_SEARCH, builder);
   }
 
-  public void trackBookmarksSearchResultSelected(@NonNull String value)
+  public void trackBookmarksListSearchResultSelected()
+  {
+    trackBookmarksSearchResultSelected(ParamValue.BOOKMARKS_LIST);
+  }
+
+  private void trackBookmarksSearchResultSelected(@NonNull String value)
   {
     ParameterBuilder builder = new ParameterBuilder().add(EventParam.FROM, value);
     trackEvent(EventName.BM_BOOKMARKS_SEARCH_RESULT_SELECTED, builder);
diff --git a/search/processor.cpp b/search/processor.cpp
index 424a8fd887..c0c6524a28 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -79,20 +79,18 @@ string GetStatisticsMode(SearchParams const & params)
 {
   switch (params.m_mode)
   {
-  case Mode::Everywhere:
   case Mode::Viewport:
-    return "Main";
+    return "Viewport";
+  case Mode::Everywhere:
+    return "Everywhere";
   case Mode::Downloader:
     return "Downloader";
   case Mode::Bookmarks:
     if (params.m_bookmarksGroupId != bookmarks::kInvalidGroupId)
       return "BookmarksList";
     return "Bookmarks";
-    break;
   case Mode::Count:
-    CHECK(false, ());
-    return "";
-    break;
+    UNREACHABLE();
   }
   UNREACHABLE();
 }
@@ -122,7 +120,7 @@ void SendStatistics(SearchParams const & params, m2::RectD const & viewport, Res
       {"query", params.m_query},
       {"locale", params.m_inputLocale},
       {"results", resultString},
-      {"from", GetStatisticsMode(params)}
+      {"mode", GetStatisticsMode(params)}
   };
   alohalytics::LogEvent("searchEmitResultsAndCoords", stats);
   GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kSearchEmitResultsAndCoords, {});