From 6ba882bfe55470325c287bbc5b69edf3b3a1c22a Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Thu, 9 Nov 2017 12:54:27 +0300
Subject: [PATCH] [partners_api] review fixes

---
 partners_api/booking_api.cpp                 | 6 +++---
 partners_api/booking_api.hpp                 | 7 +++----
 partners_api/booking_availability_params.cpp | 8 +++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/partners_api/booking_api.cpp b/partners_api/booking_api.cpp
index 27943f1c98..20b498d43f 100644
--- a/partners_api/booking_api.cpp
+++ b/partners_api/booking_api.cpp
@@ -232,20 +232,20 @@ void FillPriceAndCurrency(string const & src, string const & currency, string &
   }
 }
 
-void FillHotelIds(string const & src, vector<std::string> & result)
+void FillHotelIds(string const & src, vector<std::string> & ids)
 {
   my::Json root(src.c_str());
   auto const resultsArray = json_object_get(root.get(), "result");
 
   auto const size = json_array_size(resultsArray);
 
-  result.resize(size);
+  ids.resize(size);
   for (size_t i = 0; i < size; ++i)
   {
     auto const obj = json_array_get(resultsArray, i);
     uint64_t id = 0;
     FromJSONObject(obj, "hotel_id", id);
-    result[i] = std::to_string(id);
+    ids[i] = std::to_string(id);
   }
 }
 }  // namespace
diff --git a/partners_api/booking_api.hpp b/partners_api/booking_api.hpp
index 36ba04f377..7509ee628b 100644
--- a/partners_api/booking_api.hpp
+++ b/partners_api/booking_api.hpp
@@ -60,11 +60,10 @@ public:
 
 using GetMinPriceCallback = platform::SafeCallback<void(std::string const & hotelId, std::string const & price, std::string const & currency)>;
 using GetHotelInfoCallback = platform::SafeCallback<void(HotelInfo const & hotelInfo)>;
-// NOTE: this callback will be called NOT on main thread.
+// NOTE: this callback will be called on the network thread.
 using GetHotelAvailabilityCallback = std::function<void(std::vector<std::string> hotelIds)>;
 
-/// Guarantees the preservation of the sequence of calls callbacks in accordance with
-/// the sequence of method calls.
+/// Callbacks will be called in the same order as methods are called.
 class Api
 {
 public:
@@ -78,7 +77,7 @@ public:
   void GetMinPrice(std::string const & hotelId, std::string const & currency,
                    GetMinPriceCallback const & fn) const;
 
-  /// NOTE: callback will be called NOT on main thread.
+  /// NOTE: callback will be called on the network thread.
   void GetHotelAvailability(AvailabilityParams const & params,
                             GetHotelAvailabilityCallback const & fn) const;
 
diff --git a/partners_api/booking_availability_params.cpp b/partners_api/booking_availability_params.cpp
index 005ed7adeb..a236e86ba7 100644
--- a/partners_api/booking_availability_params.cpp
+++ b/partners_api/booking_availability_params.cpp
@@ -3,9 +3,7 @@
 
 #include "base/string_utils.hpp"
 
-#include "private.h"
-
-using namespace base::url;
+using namespace base;
 
 namespace
 {
@@ -17,9 +15,9 @@ std::string FormatTime(booking::AvailabilityParams::Time p)
 
 namespace booking
 {
-Params AvailabilityParams::Get() const
+url::Params AvailabilityParams::Get() const
 {
-  Params result;
+  url::Params result;
 
   result.push_back({"hotel_ids", strings::JoinStrings(m_hotelIds, ',')});
   result.push_back({"checkin", FormatTime(m_checkin)});