Fix path duplication with catalog provider (#1326)

Fix path duplication when using catalog endpoint provider:
as it's base url being set in GetStaticUrl method of OlpClient
there is no need to add path later in GetCatalog.

Relates-To: OLPEDGE-2730

Signed-off-by: Yevhenii Dudnyk <[email protected]>

Author: dudnyk

olp-cpp-sdk-dataservice-read/src/generated/api/ConfigApi.cpp

@@ -43,7 +43,8 @@ ConfigApi::CatalogResponse ConfigApi::GetCatalog(
   if (billing_tag) {
     query_params.insert(std::make_pair("billingTag", *billing_tag));
   }
-  std::string catalog_uri = "/catalogs/" + catalog_hrn;
+  auto catalog_uri =
+      catalog_hrn.empty() ? std::string() : "/catalogs/" + catalog_hrn;
 
   client::HttpResponse response = client.CallApi(
       std::move(catalog_uri), "GET", std::move(query_params),

olp-cpp-sdk-dataservice-read/src/repositories/CatalogRepository.cpp

@@ -54,7 +54,10 @@ CatalogResponse CatalogRepository::GetCatalog(
     const CatalogRequest& request, client::CancellationContext context) {
   const auto request_key = request.CreateKey();
   const auto fetch_options = request.GetFetchOption();
-  const auto catalog_str = catalog_.ToCatalogHRNString();
+  const auto catalog_str =
+      settings_.api_lookup_settings.catalog_endpoint_provider
+          ? std::string()
+          : catalog_.ToCatalogHRNString();
 
   repository::CatalogCacheRepository repository(
       catalog_, settings_.cache, settings_.default_cache_expiration);

tests/integration/olp-cpp-sdk-dataservice-read/CatalogClientCacheTest.cpp

@@ -43,6 +43,7 @@ constexpr auto kClientTestCacheDir = "\\catalog_client_test\\cache";
 constexpr auto kClientTestDir = "/catalog_client_test";
 constexpr auto kClientTestCacheDir = "/cata.log_client_test/cache";
 #endif
+constexpr auto kWaitTimeout = std::chrono::seconds(3);
 
 class CatalogClientCacheTest : public integration::CatalogClientTestBase {
  protected:
@@ -166,6 +167,27 @@ TEST_P(CatalogClientCacheTest, GetCatalog) {
             catalog_response.GetResult().GetName());
 }
 
+TEST_P(CatalogClientCacheTest, GetCatalogUsingCatalogEndpointProvider) {
+  olp::client::HRN hrn(GetTestCatalog());
+
+  std::string provider_url =
+      "https://api-lookup.data.api.platform.here.com/lookup/v1";
+  EXPECT_CALL(*network_mock_, Send(IsGetRequest(provider_url + "/catalogs/" +
+                                                hrn.ToCatalogHRNString()),
+                                   _, _, _, _))
+      .WillOnce(::testing::Return(
+          olp::http::SendOutcome(olp::http::ErrorCode::SUCCESS)));
+
+  settings_.api_lookup_settings.catalog_endpoint_provider =
+      [&provider_url](const olp::client::HRN&) { return provider_url; };
+  auto catalog_client = std::make_unique<read::CatalogClient>(hrn, settings_);
+
+  auto request = read::CatalogRequest();
+  auto future = catalog_client->GetCatalog(request).GetFuture();
+  ASSERT_NE(future.wait_for(kWaitTimeout), std::future_status::timeout);
+  future.get();
+}
+
 INSTANTIATE_TEST_SUITE_P(, CatalogClientCacheTest,
                          ::testing::Values(integration::CacheType::IN_MEMORY,
                                            integration::CacheType::DISK,