Skip to content
Snippets Groups Projects
Commit 77c23066 authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

get last for broker

parent fa8329b4
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,7 @@ class FolderDataBroker final : public asapo::DataBroker {
int current_file_;
FileInfos filelist_;
Error CanGetData(FileInfo* info, FileData* data, uint64_t nfile) const noexcept;
Error GetFileByIndex(uint64_t nfile_to_get,FileInfo* info, FileData* data);
Error GetFileByIndex(uint64_t nfile_to_get, FileInfo* info, FileData* data);
std::mutex mutex_;
};
......
......@@ -141,19 +141,19 @@ Error ServerDataBroker::GetFileInfoFromServer(FileInfo* info, GetImageServerOper
}
Error ServerDataBroker::GetNext(FileInfo* info, FileData* data) {
return GetImageFromServer(GetImageServerOperation::GetNext,info,data);
return GetImageFromServer(GetImageServerOperation::GetNext, info, data);
}
Error ServerDataBroker::GetLast(FileInfo* info, FileData* data) {
return GetImageFromServer(GetImageServerOperation::GetLast,info,data);
return GetImageFromServer(GetImageServerOperation::GetLast, info, data);
}
std::string ServerDataBroker::OpToUriCmd(GetImageServerOperation op) {
switch (op) {
case GetImageServerOperation::GetNext:
return "next";
case GetImageServerOperation::GetLast:
return "last";
case GetImageServerOperation::GetNext:
return "next";
case GetImageServerOperation::GetLast:
return "last";
}
return "";
}
......
......@@ -11,8 +11,8 @@ namespace asapo {
Error HttpCodeToWorkerError(const HttpCode& code);
enum class GetImageServerOperation {
GetNext,
GetLast
GetNext,
GetLast
};
class ServerDataBroker final : public asapo::DataBroker {
......@@ -22,7 +22,7 @@ class ServerDataBroker final : public asapo::DataBroker {
Error GetNext(FileInfo* info, FileData* data) override;
Error GetLast(FileInfo* info, FileData* data) override;
void SetTimeout(uint64_t timeout_ms) override;
void SetTimeout(uint64_t timeout_ms) override;
std::unique_ptr<IO> io__; // modified in testings to mock system calls,otherwise do not touch
std::unique_ptr<HttpClient> httpclient__;
private:
......
......@@ -119,9 +119,9 @@ TEST_F(ServerDataBrokerTests, GetLastUsesCorrectUri) {
EXPECT_CALL(mock_http_client, Get_t(expected_broker_uri + "/database/beamtime_id/last?token=" + expected_token, _,
_)).WillOnce(DoAll(
SetArgPointee<1>(HttpCode::OK),
SetArgPointee<2>(nullptr),
Return("")));
SetArgPointee<1>(HttpCode::OK),
SetArgPointee<2>(nullptr),
Return("")));
data_broker->GetLast(&info, nullptr);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment