[generator][promo] The type sponsored-promo_catalog is added into cities.

3 files changed, 13 insertions, 4 deletions

diff --git a/partners_api/partners_api_tests/promo_tests.cpp b/partners_api/partners_api_tests/promo_tests.cpp
index 06e52f0c27..0492495a07 100644
--- a/partners_api/partners_api_tests/promo_tests.cpp
+++ b/partners_api/partners_api_tests/promo_tests.cpp
@@ -136,7 +136,7 @@ UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_NeedToShowAfterBooking)
 
 UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_GetCityGallery)
 {
-  promo::Api api("http://localhost:34568/gallery/city/");
+  promo::Api api("http://localhost:34568/");
   api.SetDelegate(std::make_unique<DelegateForTesting>());
 
   {
diff --git a/partners_api/promo_api.cpp b/partners_api/promo_api.cpp
index 18c6eb94ab..afbaaf615b 100644
--- a/partners_api/promo_api.cpp
+++ b/partners_api/promo_api.cpp
@@ -8,10 +8,13 @@
 #include "platform/preferred_languages.hpp"
 #include "platform/settings.hpp"
 
+#include "base/string_utils.hpp"
+
 #include "base/assert.hpp"
 
 #include <algorithm>
 #include <chrono>
+#include <cstdint>
 #include <utility>
 
 #include "3party/jansson/myjansson.hpp"
@@ -87,12 +90,16 @@ void ParseCityGallery(std::string const & src, promo::CityGallery & result)
 
   auto const meta = json_object_get(root.get(), "meta");
   FromJSONObject(meta, "more", result.m_moreUrl);
+  result.m_moreUrl.insert(0, BOOKMARKS_CATALOG_FRONT_URL);
 }
 
 std::string MakeCityGalleryUrl(std::string const & baseUrl, std::string const & id,
                                std::string const & lang)
 {
-  return baseUrl + id + "/?lang=" + lang;
+  ASSERT(!baseUrl.empty(), ());
+  ASSERT_EQUAL(baseUrl.back(), '/', ());
+
+  return baseUrl + "gallery/v1/city/" + id + "/?lang=" + lang;
 }
 
 void GetPromoCityGalleryImpl(std::string const & baseUrl, std::string const & id,
@@ -143,7 +150,7 @@ bool WebApi::GetCityGalleryById(std::string const & baseUrl, std::string const &
   return request.RunHttpRequest(result);
 }
 
-Api::Api(std::string const & baseUrl /* = "https://routes.maps.me/gallery/v1/city/" */)
+Api::Api(std::string const & baseUrl /* = BOOKMARKS_CATALOG_FRONT_URL */)
   : m_baseUrl(baseUrl)
 {
 }
diff --git a/partners_api/promo_api.hpp b/partners_api/promo_api.hpp
index d106f6b9e5..ff9bd23f9c 100644
--- a/partners_api/promo_api.hpp
+++ b/partners_api/promo_api.hpp
@@ -10,6 +10,8 @@
 #include <string>
 #include <vector>
 
+#include "private.h"
+
 namespace promo
 {
 struct Author
@@ -61,7 +63,7 @@ public:
     virtual std::string GetCityId(m2::PointD const & point) = 0;
   };
 
-  explicit Api(std::string const & baseUrl = "https://routes.maps.me/gallery/v1/city/");
+  explicit Api(std::string const & baseUrl = BOOKMARKS_CATALOG_FRONT_URL);
 
   void SetDelegate(std::unique_ptr<Delegate> delegate);
   void OnEnterForeground();