Added bones of base position service.
This commit is contained in:
1 parent
17769cbced
commit
0afededebf
10 files changed
+268
-16
No files matched your search
@@ -1 +1 @@
|
||||
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;ordermLine truncated
|
||||
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;ordermLine truncated
|
||||
@@ -110,6 +110,11 @@ message BasePosition {
|
||||
google.protobuf.Timestamp current_as_of = 7; // UTC
|
||||
}
|
||||
|
||||
message SetBasePositionResponse {
|
||||
bool ok = 1;
|
||||
string msg = 2;
|
||||
}
|
||||
|
||||
message BasePositionBatch {
|
||||
repeated BasePosition positions = 1;
|
||||
}
|
||||
@@ -120,7 +125,7 @@ service PositionService {
|
||||
rpc create_manual_fill (ManualFillBatch) returns (PositionServiceResponse);
|
||||
rpc update_manual_fill (ManualFillBatch) returns (PositionServiceResponse);
|
||||
rpc remove_manual_fill (ManualFillBatch) returns (PositionServiceResponse);
|
||||
rpc set_base_position (BasePositionBatch) returns (PositionServiceResponse);
|
||||
rpc set_base_position (BasePositionBatch) returns (SetBasePositionResponse);
|
||||
|
||||
// subscription
|
||||
rpc manual_fills(bts.api.VoidMessage) returns (stream ManualFill);
|
||||
|
||||
@@ -5,8 +5,8 @@ package bts.config;
|
||||
message GMI_Import
|
||||
{
|
||||
required string sftp_url= 1;
|
||||
required string start_poll_window_time = 2 [ default = "22:01"] ; // CENTRAL TIME
|
||||
required string end_poll_window_time = 3 [default = "23:00" ];// CENTRAL TIME
|
||||
required int32 poll_period_seconds = 4 [default = 60];
|
||||
required string sftp_password = 2;
|
||||
required int32 pause_between_dowloads_seconds = 4 [default = 60];
|
||||
required int32 download_timeout_seconds = 5 [default = 35];
|
||||
}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
#include "lib/utils/sftp.h"
|
||||
|
||||
namespace bts {
|
||||
namespace utils {
|
||||
void begin_sftp_download(
|
||||
std::string const &,
|
||||
std::string const &,
|
||||
std::string const &, uint32_t ,
|
||||
std::function<void(DownloadResult const &)> const on_done) {
|
||||
on_done( DownloadFailure {"not implemented"});
|
||||
}
|
||||
|
||||
|
||||
}}
|
||||
@@ -0,0 +1,23 @@
|
||||
#pragma once
|
||||
|
||||
#include <variant>
|
||||
#include <string>
|
||||
#include <functional>
|
||||
|
||||
namespace bts {
|
||||
namespace utils {
|
||||
|
||||
struct DownloadSuccess {
|
||||
std::string const file_path;
|
||||
};
|
||||
struct DownloadFailure {
|
||||
std::string const error_msg;
|
||||
};
|
||||
using DownloadResult = std::variant<DownloadSuccess, DownloadFailure>;
|
||||
void begin_sftp_download(
|
||||
std::string const &url,
|
||||
std::string const &password,
|
||||
std::string const &file_name, uint32_t time_out_secs,
|
||||
std::function<void(DownloadResult const &)> const) ;
|
||||
|
||||
}}
|
||||
@@ -1,14 +1,200 @@
|
||||
#include "BasePositionServiceServer.h"
|
||||
#include "lib/api/public/ServiceContext.h"
|
||||
#include "lib/api/services/AdminService.client.pb.h"
|
||||
#include "lib/api/services/PositionService.client.pb.h"
|
||||
#include "lib/api/services/PositionService.pb.h"
|
||||
#include "lib/config/config.h"
|
||||
#include "lib/config/protos/position_cfg.pb.h"
|
||||
#include "lib/logging/logging.h"
|
||||
#include "lib/utils/bts_assert.h"
|
||||
#include "lib/utils/bts_chrono.h"
|
||||
#include "lib/utils/sftp.h"
|
||||
|
||||
#include <variant>
|
||||
|
||||
namespace bts {
|
||||
namespace position {
|
||||
|
||||
struct BasePositionServiceServer::PImpl {};
|
||||
|
||||
BasePositionServiceServer::BasePositionServiceServer(bts::api::ServiceContext &ctx) :
|
||||
BasePositionServiceBase(ctx)
|
||||
{}
|
||||
enum class BasePositionServiceServer::State {
|
||||
W_ADMIN,
|
||||
SYNCHED,
|
||||
DOWNLOADING,
|
||||
PAUSED
|
||||
};
|
||||
|
||||
struct BasePositionServiceServer::PImpl {
|
||||
PImpl(bts::api::ServiceContext &ctx)
|
||||
: ctx(ctx), state(State::W_ADMIN), last_download_attempt_ts(),
|
||||
admin_service(ctx.locate<api::admin::AdminService>()),
|
||||
pos_service(ctx.locate<api::position::PositionService>()),
|
||||
admin_data() {}
|
||||
|
||||
bts::api::ServiceContext &ctx;
|
||||
State state = State::W_ADMIN;
|
||||
TimeStamp last_download_attempt_ts;
|
||||
api::admin::AdminService admin_service;
|
||||
api::position::PositionService pos_service;
|
||||
std::shared_ptr<const api::admin::AdminData> admin_data;
|
||||
std::optional<api::position::BasePositionBatch> base_position;
|
||||
};
|
||||
|
||||
BasePositionServiceServer::BasePositionServiceServer(
|
||||
bts::api::ServiceContext &ctx)
|
||||
: BasePositionServiceBase(ctx), me(new PImpl(ctx)) {
|
||||
on_timer();
|
||||
|
||||
me->admin_service.subscribe_admin_data() |
|
||||
rxcpp::operators::subscribe<api::admin::Admin_dataUpdate>(
|
||||
[this](auto const &update) {
|
||||
bts_assert(update.all().size() == 1);
|
||||
on_admin_data(update.all()[0]);
|
||||
});
|
||||
}
|
||||
|
||||
BasePositionServiceServer::~BasePositionServiceServer() {}
|
||||
|
||||
}}
|
||||
void BasePositionServiceServer::on_timer() {
|
||||
me->ctx.post([this]() { on_timer(); }, 1000);
|
||||
switch (me->state) {
|
||||
case State::W_ADMIN:
|
||||
break;
|
||||
case State::SYNCHED:
|
||||
break;
|
||||
case State::DOWNLOADING:
|
||||
break;
|
||||
case State::PAUSED:
|
||||
start_synch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void BasePositionServiceServer::transition(State new_state) {
|
||||
LOG(OrderMan, Info, "Transitioning BasePositionServiceServer from {} to {}",
|
||||
state_name(me->state), state_name(new_state));
|
||||
me->state = new_state;
|
||||
}
|
||||
|
||||
std::string BasePositionServiceServer::state_name(State st) const {
|
||||
switch (st) {
|
||||
case State::W_ADMIN:
|
||||
return "W_ADMIN";
|
||||
case State::SYNCHED:
|
||||
return "SYNCHED";
|
||||
case State::DOWNLOADING:
|
||||
return "DOWNLOADING";
|
||||
case State::PAUSED:
|
||||
return "PAUSED";
|
||||
}
|
||||
bts_assert(false);
|
||||
return "";
|
||||
}
|
||||
|
||||
void BasePositionServiceServer::on_admin_data(
|
||||
std::shared_ptr<const api::admin::AdminData> const &a) {
|
||||
LOG(OrderMan, Info, "Received new admin data");
|
||||
|
||||
me->admin_data = a;
|
||||
|
||||
switch (me->state) {
|
||||
case State::W_ADMIN:
|
||||
start_synch();
|
||||
return;
|
||||
case State::SYNCHED:
|
||||
LOG(OrderMan, Info,
|
||||
"Will recompute base position based on new admin data");
|
||||
start_synch();
|
||||
return;
|
||||
case State::DOWNLOADING:
|
||||
case State::PAUSED:
|
||||
return;
|
||||
}
|
||||
bts_assert(false);
|
||||
}
|
||||
|
||||
void BasePositionServiceServer::start_synch() {
|
||||
|
||||
// We cannot start synching right away if we recently tried to
|
||||
// download
|
||||
if (sec_diff(Timer::now(), me->last_download_attempt_ts) <=
|
||||
config::get<config::GMI_Import>().pause_between_dowloads_seconds()) {
|
||||
if (me->state != State::PAUSED)
|
||||
transition(State::PAUSED);
|
||||
return;
|
||||
}
|
||||
me->last_download_attempt_ts = Timer::now();
|
||||
transition(State::DOWNLOADING);
|
||||
|
||||
using namespace bts::utils;
|
||||
|
||||
begin_sftp_download(
|
||||
config::get<config::GMI_Import>().sftp_url(),
|
||||
config::get<config::GMI_Import>().sftp_password(),
|
||||
get_previous_session_file_name(),
|
||||
config::get<config::GMI_Import>().download_timeout_seconds() * 1000,
|
||||
[this](auto const &result) {
|
||||
if (std::holds_alternative<DownloadFailure>(result)) {
|
||||
auto error_msg =
|
||||
fmt::format("Failed to download GMI file. Error={}",
|
||||
std::get<DownloadFailure>(result).error_msg);
|
||||
LOG(OrderMan, Error, "{}", error_msg);
|
||||
me->ctx.post([this, error_msg]() { on_error(error_msg); });
|
||||
} else {
|
||||
auto file_path = std::get<DownloadSuccess>(result).file_path;
|
||||
LOG(OrderMan, Warn, "Succesfully downloaded GMI file to {}",
|
||||
file_path);
|
||||
me->ctx.post(
|
||||
[this, file_path]() { on_download_success(file_path); });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void BasePositionServiceServer::on_download_success(
|
||||
std::string const &file_path) {
|
||||
bts_assert(me->state == State::DOWNLOADING);
|
||||
|
||||
auto parse_result = parse_gmi_file(file_path);
|
||||
if (std::holds_alternative<api::position::BasePositionBatch>(parse_result)) {
|
||||
me->base_position =
|
||||
std::get<api::position::BasePositionBatch>(parse_result);
|
||||
|
||||
LOG(OrderMan, Warn,
|
||||
"Successfully parsed GMI file at {}. Extracted {} records for the "
|
||||
"base position",
|
||||
file_path, me->base_position.value().positions_size());
|
||||
|
||||
transition(State::SYNCHED);
|
||||
me->pos_service.set_base_position(me->base_position.value(),
|
||||
[this](auto const &rr) {
|
||||
if (!rr.success())
|
||||
on_error(rr.error_message());
|
||||
else if (!rr.value()->ok())
|
||||
on_error(rr.value()->msg());
|
||||
},
|
||||
5000);
|
||||
} else {
|
||||
auto error_msg =
|
||||
fmt::format("Failed to parse GMI file at {}. Error msg: {}",
|
||||
file_path, std::get<std::string>(parse_result));
|
||||
on_error(error_msg);
|
||||
}
|
||||
}
|
||||
|
||||
void BasePositionServiceServer::on_error(std::string const &error_msg) {
|
||||
bts_assert(me->state == State::DOWNLOADING);
|
||||
|
||||
LOG(OrderMan, Error,
|
||||
"Failed to obtain a valid base position. The following information is "
|
||||
"available:",
|
||||
error_msg);
|
||||
start_synch();
|
||||
}
|
||||
|
||||
std::string BasePositionServiceServer::get_previous_session_file_name() {
|
||||
return "";
|
||||
}
|
||||
|
||||
std::variant<api::position::BasePositionBatch, std::string>
|
||||
BasePositionServiceServer::parse_gmi_file(std::string const &) {return "";}
|
||||
|
||||
} // namespace position
|
||||
} // namespace bts
|
||||
@@ -2,6 +2,19 @@
|
||||
|
||||
#include "lib/api/services/BasePositionService.server.pb.h"
|
||||
#include <memory>
|
||||
#include <variant>
|
||||
|
||||
|
||||
namespace bts {
|
||||
namespace api {
|
||||
namespace position {
|
||||
class BasePositionBatch;
|
||||
}
|
||||
namespace admin {
|
||||
class AdminData;
|
||||
}
|
||||
} // namespace api
|
||||
} // namespace bts
|
||||
|
||||
namespace bts {
|
||||
namespace position {
|
||||
@@ -9,10 +22,21 @@ namespace position {
|
||||
class BasePositionServiceServer
|
||||
: public bts::api::position::BasePositionServiceBase {
|
||||
public:
|
||||
BasePositionServiceServer(bts::api::ServiceContext &ctx) ;
|
||||
BasePositionServiceServer(bts::api::ServiceContext &ctx);
|
||||
~BasePositionServiceServer();
|
||||
|
||||
private:
|
||||
void on_timer();
|
||||
void on_admin_data(std::shared_ptr<const api::admin::AdminData> const &);
|
||||
void start_synch();
|
||||
enum class State;
|
||||
void transition(State new_state);
|
||||
std::string get_previous_session_file_name();
|
||||
void on_download_success(std::string const &file_path);
|
||||
void on_error(std::string const&msg);
|
||||
std::variant<api::position::BasePositionBatch,std::string>
|
||||
parse_gmi_file(std::string const &file_path);
|
||||
std::string state_name(State) const;
|
||||
struct PImpl;
|
||||
std::unique_ptr<PImpl> me;
|
||||
};
|
||||
|
||||
@@ -379,7 +379,7 @@ void PositionServiceServer::remove_manual_fill(
|
||||
|
||||
void PositionServiceServer::set_base_position(
|
||||
const ::bts::api::position::BasePositionBatch &,
|
||||
const api::Response<::bts::api::position::PositionServiceResponse> &) {
|
||||
const api::Response<::bts::api::position::SetBasePositionResponse> &) {
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -81,7 +81,7 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase {
|
||||
|
||||
void set_base_position(
|
||||
const ::bts::api::position::BasePositionBatch &request,
|
||||
const api::Response<::bts::api::position::PositionServiceResponse>
|
||||
const api::Response<::bts::api::position::SetBasePositionResponse>
|
||||
&reply) override;
|
||||
|
||||
~PositionServiceServer();
|
||||
|
||||
@@ -147,8 +147,8 @@ let saveAccount (admin:IAdminService) (account:BTSAccount) (manualFillData:Manua
|
||||
let! result5 = model.positionService.create_manual_fill (convertTempFillList manualFillData.newFills model)
|
||||
let! result6 = model.positionService.update_manual_fill (convertTempFillList manualFillData.updatedFills model)
|
||||
|
||||
let result5Msg = Array.tryFind (fun i -> (not i.ok)) result5.response
|
||||
let result6Msg = Array.tryFind (fun i -> (not i.ok)) result6.response
|
||||
let result5Msg = result5.response |> Array.tryFind (fun i -> (not i.ok))
|
||||
let result6Msg = result6.response |> Array.tryFind (fun i -> (not i.ok))
|
||||
|
||||
match result.isSuccess, result5Msg, result6Msg with
|
||||
| false, _, _ ->
|
||||
|
||||
Reference in new issue
Block a user