[catalog] sending downloaded guides ids on start of catalog is added

mapsme · May 19, 2020 · f01eacf · f01eacf
1 parent 43564cb
commit f01eacf
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 0 deletions.
diff --git a/map/bookmark_catalog.cpp b/map/bookmark_catalog.cpp
@@ -258,6 +258,11 @@ bool BookmarkCatalog::HasDownloaded(std::string const & id) const
   return m_registeredInCatalog.find(id) != m_registeredInCatalog.cend();
 }
 
+std::set<std::string> const & BookmarkCatalog::GetDownloadedIds() const
+{
+  return m_registeredInCatalog;
+}
+
 void BookmarkCatalog::Download(std::string const & id, std::string const & accessToken,
                                DownloadStartCallback && startHandler,
                                DownloadFinishCallback && finishHandler)

diff --git a/map/bookmark_catalog.hpp b/map/bookmark_catalog.hpp
@@ -80,6 +80,7 @@ class BookmarkCatalog
 
   bool IsDownloading(std::string const & id) const;
   bool HasDownloaded(std::string const & id) const;
+  std::set<std::string> const & GetDownloadedIds() const;
   size_t GetDownloadingCount() const { return m_downloadingIds.size(); }
 
   std::string GetDownloadUrl(std::string const & serverId) const;

diff --git a/map/catalog_headers_provider.cpp b/map/catalog_headers_provider.cpp
@@ -1,5 +1,7 @@
 #include "map/catalog_headers_provider.hpp"
 
+#include "map/bookmark_catalog.hpp"
+
 #include <set>
 
 CatalogHeadersProvider::CatalogHeadersProvider(PositionProvider const & positionProvider,
@@ -9,6 +11,13 @@ CatalogHeadersProvider::CatalogHeadersProvider(PositionProvider const & position
 {
 }
 
+void CatalogHeadersProvider::SetBookmarkCatalog(BookmarkCatalog const * bookmarkCatalog)
+{
+  ASSERT(bookmarkCatalog != nullptr, ());
+
+  m_bookmarkCatalog = bookmarkCatalog;
+}
+
 platform::HttpClient::Headers CatalogHeadersProvider::GetHeaders()
 {
   web_api::HeadersParams params;
@@ -30,6 +39,12 @@ platform::HttpClient::Headers CatalogHeadersProvider::GetHeaders()
   }
   params.m_countryGeoIds.assign(countries.cbegin(), countries.cend());
 
+  if (m_bookmarkCatalog != nullptr && !m_bookmarkCatalog->GetDownloadedIds().empty())
+  {
+    auto const & ids = m_bookmarkCatalog->GetDownloadedIds();
+    params.m_downloadedGuidesIds.assign(ids.cbegin(), ids.cend());
+  }
+
   return web_api::GetCatalogHeaders(params);
 }
 

diff --git a/map/catalog_headers_provider.hpp b/map/catalog_headers_provider.hpp
@@ -10,16 +10,21 @@
 
 #include <optional>
 
+class BookmarkCatalog;
+
 class CatalogHeadersProvider
 {
 public:
   CatalogHeadersProvider(PositionProvider const & positionProvider,
                          storage::Storage const & storage);
 
+  void SetBookmarkCatalog(BookmarkCatalog const * bookmarkCatalog);
+
   platform::HttpClient::Headers GetHeaders();
   std::optional<platform::HttpClient::Header> GetPositionHeader();
 
 private:
   PositionProvider const & m_positionProvider;
   storage::Storage const & m_storage;
+  BookmarkCatalog const * m_bookmarkCatalog = nullptr;
 };
diff --git a/map/framework.cpp b/map/framework.cpp
@@ -468,6 +468,7 @@ Framework::Framework(FrameworkParams const & params)
 
   m_bmManager->InitRegionAddressGetter(m_featuresFetcher.GetDataSource(), *m_infoGetter);
 
+  catalogHeadersProvider->SetBookmarkCatalog(&m_bmManager->GetCatalog());
   m_parsedMapApi.SetBookmarkManager(m_bmManager.get());
   m_routingManager.SetBookmarkManager(m_bmManager.get());
   m_guidesManager.SetBookmarkManager(m_bmManager.get());

diff --git a/web_api/request_headers.cpp b/web_api/request_headers.cpp
@@ -20,6 +20,7 @@ char const * const kUserAgentHeader = "User-Agent";
 char const * const kCitiesHeader = "X-Mapsme-City-Ids";
 char const * const kCountriesHeader = "X-Mapsme-Country-Ids";
 char const * const kLatLonHeader = "X-Mapsme-Lat-Lon";
+char const * const kGuidesHeader = "X-Mapsme-Downloaded-Guides";
 }  // namespace
 
 platform::HttpClient::Headers GetDefaultCatalogHeaders()
@@ -64,6 +65,9 @@ platform::HttpClient::Headers GetCatalogHeaders(HeadersParams const & params)
   if (!params.m_countryGeoIds.empty())
     result.emplace(kCountriesHeader, strings::JoinAny(params.m_countryGeoIds));
 
+  if (!params.m_downloadedGuidesIds.empty())
+    result.emplace(kGuidesHeader, strings::JoinAny(params.m_downloadedGuidesIds));
+
   return result;
 }
 }  // namespace web_api
diff --git a/web_api/request_headers.hpp b/web_api/request_headers.hpp
@@ -17,6 +17,7 @@ class HeadersParams
   std::optional<m2::PointD> m_currentPosition;
   std::vector<base::GeoObjectId> m_countryGeoIds;
   std::vector<base::GeoObjectId> m_cityGeoIds;
+  std::vector<std::string> m_downloadedGuidesIds;
 };
 
 platform::HttpClient::Headers GetDefaultCatalogHeaders();