From dcb9a778f9ea1fa812741c2157517a068757063d Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Thu, 12 Apr 2018 17:23:32 +0300
Subject: [PATCH] [taxi] places review fixes

---
 coding/serdes_json.hpp                               |  8 ++++----
 .../partners_api_tests/taxi_places_tests.cpp         | 12 ++++++------
 partners_api/taxi_provider.hpp                       |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/coding/serdes_json.hpp b/coding/serdes_json.hpp
index 98b213c456..6739d74155 100644
--- a/coding/serdes_json.hpp
+++ b/coding/serdes_json.hpp
@@ -165,7 +165,7 @@ public:
   template <typename T>
   void operator()(std::vector<T> & vs, char const * name = nullptr)
   {
-    json_t * context = SaveContext(name);
+    json_t * outerContext = SaveContext(name);
 
     if (!json_is_array(m_json))
       MYTHROW(my::Json::Exception, ("The field", name, "must contain a json array."));
@@ -179,13 +179,13 @@ public:
       RestoreContext(context);
     }
 
-    RestoreContext(context);
+    RestoreContext(outerContext);
   }
 
   template <typename T>
   void operator()(std::unordered_set<T> & dest, char const * name = nullptr)
   {
-    json_t * context = SaveContext(name);
+    json_t * outerContext = SaveContext(name);
 
     if (!json_is_array(m_json))
       MYTHROW(my::Json::Exception, ("The field", name, "must contain a json array."));
@@ -202,7 +202,7 @@ public:
       RestoreContext(context);
     }
 
-    RestoreContext(context);
+    RestoreContext(outerContext);
   }
 
   template <typename R>
diff --git a/partners_api/partners_api_tests/taxi_places_tests.cpp b/partners_api/partners_api_tests/taxi_places_tests.cpp
index a2378b54ce..1fb2b81b7a 100644
--- a/partners_api/partners_api_tests/taxi_places_tests.cpp
+++ b/partners_api/partners_api_tests/taxi_places_tests.cpp
@@ -15,9 +15,9 @@ public:
   {
     using places::Loader;
 
-    std::vector<taxi::SupportedPlaces> places = {Loader::LoadFor(Provider::Type::Maxim),
-                                                 Loader::LoadFor(Provider::Type::Uber),
-                                                 Loader::LoadFor(Provider::Type::Yandex)};
+    std::vector<taxi::SupportedPlaces> places;
+    for (size_t i = 0; i < Provider::Type::Count; ++i)
+      places.emplace_back(Loader::LoadFor(static_cast<Provider::Type>(i)));
 
     for (size_t i = 0; i < places.size(); ++i)
     {
@@ -26,14 +26,14 @@ public:
         if (i == j)
           continue;
 
-        FindIdenticalPlaces(places[i].m_enabledPlaces, places[j].m_enabledPlaces);
-        FindIdenticalPlaces(places[i].m_disabledPlaces, places[j].m_disabledPlaces);
+        CheckAbsenceOfSimilarPlaces(places[i].m_enabledPlaces, places[j].m_enabledPlaces);
+        CheckAbsenceOfSimilarPlaces(places[i].m_disabledPlaces, places[j].m_disabledPlaces);
       }
     }
   }
 
 private:
-  static void FindIdenticalPlaces(taxi::Places const & lhs, taxi::Places const & rhs)
+  static void CheckAbsenceOfSimilarPlaces(taxi::Places const & lhs, taxi::Places const & rhs)
   {
     for (auto const & country : lhs.m_countries)
     {
diff --git a/partners_api/taxi_provider.hpp b/partners_api/taxi_provider.hpp
index 62a8697a1b..068ba13b32 100644
--- a/partners_api/taxi_provider.hpp
+++ b/partners_api/taxi_provider.hpp
@@ -23,7 +23,8 @@ public:
   {
     Uber,
     Yandex,
-    Maxim
+    Maxim,
+    Count
   };
 
   using Iter = std::vector<Product>::iterator;