pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[partners_api] taxi::ErrorCode::NoProvider error code is added

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-06-29 18:52:59 +03:00 • committed by Ilya Grechuhin
parent 168592c349
commit 4f7d03be47
4 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
partners_api/partners_api_tests/taxi_engine_tests.cpp
View file

@ -184,7 +184,7 @@ UNIT_TEST(TaxiEngine_ResultMaker)
maker.Reset(reqId, 3, successCallback, errorNotPossibleCallback);
maker.ProcessProducts(reqId, taxi::Provider::Type::Uber, products1);
maker.ProcessProducts(reqId, taxi::Provider::Type::Yandex, products2);
maker.DecrementRequestCount(reqId);
maker.ProcessError(reqId, taxi::Provider::Type::Uber, taxi::ErrorCode::NoProvider);
maker.MakeResult(reqId);
TEST_EQUAL(providers.size(), 2, ());

12
partners_api/taxi_engine.cpp
View file

@ -42,16 +42,6 @@ void ResultMaker::Reset(uint64_t requestId, size_t requestsCount,
m_errors.clear();
}
void ResultMaker::DecrementRequestCount(uint64_t requestId)
{
std::lock_guard<std::mutex> lock(m_mutex);
if (m_requestId != requestId)
return;
DecrementRequestCount();
}
void ResultMaker::ProcessProducts(uint64_t requestId, Provider::Type type,
std::vector<Product> const & products)
{
@ -136,7 +126,7 @@ uint64_t Engine::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const
if (!IsAvailableAtPos(type, from))
{
maker->DecrementRequestCount(reqId);
maker->ProcessError(reqId, type, ErrorCode::NoProvider);
maker->MakeResult(reqId);
continue;
}

2
partners_api/taxi_engine.hpp
View file

@ -31,8 +31,6 @@ class ResultMaker
public:
void Reset(uint64_t requestId, size_t requestsCount, SuccessCallback const & successCallback,
ErrorCallback const & errorCallback);
/// Reduces number of requests outstanding.
void DecrementRequestCount(uint64_t requestId);
/// Processes successful callback from taxi api.
void ProcessProducts(uint64_t requestId, Provider::Type type,
std::vector<Product> const & products);

4
partners_api/taxi_provider.hpp
View file

@ -58,7 +58,8 @@ using ProvidersContainer = std::vector<Provider>;
enum class ErrorCode
{
NoProducts,
RemoteError
RemoteError,
NoProvider
};
struct ProviderError
@ -86,6 +87,7 @@ inline std::string DebugPrint(ErrorCode code)
{
case ErrorCode::NoProducts: return "NoProducts";
case ErrorCode::RemoteError: return "RemoteError";
case ErrorCode::NoProvider: return "NoProvider";
}
}